drop group.name from projects

api.py

@@ -114,7 +114,6 @@ if __name__ == '__main__':
     arg_parser.add_argument('--insecure', help='allow user info as urlencoded param', action='store_true', default=False)
     args = arg_parser.parse_args()
 
-    args.data_path = os.path.join(args.data_path, 'scitran')
     args.quarantine_path = os.path.join(args.data_path, 'quarantine')
     app.config = vars(args)
 

api.wsgi

@@ -27,7 +27,6 @@ ap.add_argument('--central_uri', help='scitran central api', default='https://sd
 ap.add_argument('--log_level', help='log level [info]', default='info')
 args = ap.parse_args()
 
-args.data_path = os.path.join(args.data_path, 'scitran')
 args.quarantine_path = os.path.join(args.data_path, 'quarantine')
 
 logging.basicConfig(level=getattr(logging, args.log_level.upper())) #FIXME probably not necessary, because done in api.py

projects.py

@@ -78,7 +78,7 @@ class Projects(containers.ContainerList):
     def get(self):
         """Return the User's list of Projects."""
         query = {'group._id': self.request.get('group')} if self.request.get('group') else {}
-        projection = {'group': 1, 'name': 1, 'notes': 1}
+        projection = {'group_id': 1, 'name': 1, 'notes': 1}
         projects = self._get(query, projection, self.request.get('admin').lower() in ('1', 'true'))
         if self.debug:
             for proj in projects:
@@ -89,7 +89,8 @@ class Projects(containers.ContainerList):
 
     def groups(self):
         """Return the User's list of Project Groups."""
-        return {p['group']['_id']: p['group'] for p in self.get()}.values()
+        group_ids = list(set((p['group_id'] for p in self.get())))
+        return list(self.app.db.groups.find({'_id': {'$in': group_ids}}, ['name']))
 
 
 class Project(containers.Container):

util.py

@@ -85,7 +85,7 @@ def _update_db(db, dataset):
             group_id = 'unknown'
             project_name = dataset.nims_group_id + ('/' + dataset.nims_project if dataset.nims_project else '')
         group = db.groups.find_one({'_id': group_id})
-        project_spec = {'group._id': group['_id'], 'name': project_name}
+        project_spec = {'group_id': group['_id'], 'name': project_name}
         project = db.projects.find_and_modify(
                 project_spec,
                 {'$setOnInsert': {'group.name': group.get('name'), 'permissions': group['roles'], 'public': False, 'files': []}},