- if self.theme == 'fed4fire':
- authorities_query = Query.get('myslice:authority').select('name', 'authority_hrn')
- else:
- authorities_query = Query.get('authority').select('name', 'authority_hrn')
- authorities = execute_admin_query(request, authorities_query)
- if authorities is not None:
- authorities = sorted(authorities, key=lambda k: k['authority_hrn'])
- authorities = sorted(authorities, key=lambda k: k['name'])
+
+ authorities = getAuthorities(request, admin=True)
+
+ ##if self.theme == 'fed4fire' or self.theme == 'onelab':
+ #authorities_query = Query.get('myslice:authority').select('authority_hrn')
+ ##else:
+ ## authorities_query = Query.get('authority').select('name', 'authority_hrn')
+ #authorities = execute_admin_query(request, authorities_query)
+ #if authorities is not None:
+ # authorities = sorted(authorities, key=lambda k: k['authority_hrn'])
+ # #if self.theme != 'fed4fire' or self.theme != 'onelab':
+ # # authorities = sorted(authorities, key=lambda k: k['name'])