Merge pull request #244 from scitran/collection-origin

Add join=origin logic to acquisitions and sessions on collections

api/handlers/collectionshandler.py

@@ -158,8 +158,9 @@ class CollectionsHandler(ContainerHandler):
         self._filter_all_permissions(sessions, self.uid, self.user_site)
         if self.is_true('measurements'):
             self._add_session_measurements(sessions)
-        if self.debug:
-            for sess in sessions:
+        for sess in sessions:
+            sess = self.handle_origin(sess)
+            if self.debug:
                 sess['debug'] = {}
                 sid = str(sess['_id'])
                 sess['debug']['details'] = self.uri_for('cont_details', cont_name='sessions', cid=sid, _full=True) + '?user=' + self.get_param('user', '')
@@ -193,6 +194,8 @@ class CollectionsHandler(ContainerHandler):
                 acq['debug'] = {}
                 aid = str(acq['_id'])
                 acq['debug']['details'] = self.uri_for('cont_details', cont_name='acquisitions', cid=aid, _full=True) + '?user=' + self.get_param('user', '')
+        for acquisition in acquisitions:
+            acquisition = self.handle_origin(acquisition)
         return acquisitions