def getAuthorities(self, request):
if self.theme == 'fed4fire':
- authorities_query = Query.get('myslice:authority').select('name', 'authority_hrn')
+ 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)
# Remove the root authority from the list
matching = [s for s in authorities if "." in s['authority_hrn']]
authorities = sorted(matching, key=lambda k: k['authority_hrn'])
- authorities = sorted(matching, key=lambda k: k['name'])
+ if self.theme != 'fed4fire':
+ authorities = sorted(matching, key=lambda k: k['name'])
return authorities
def getUserAuthority(self, request):
user_authority = self.getUserAuthority(wsgi_request)
# getting the org from authority
- for authority in authorities:
- if authority['authority_hrn'] == user_authority:
- authority_name = authority['name']
+ #for authority in authorities:
+ # if authority['authority_hrn'] == user_authority:
+ # authority_name = authority['name']
if method == 'POST' :
authority_name = None
# Retrieve the list of authorities
if self.theme == 'fed4fire':
- authorities_query = Query.get('myslice:authority').select('name', 'authority_hrn')
+ 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'])
- authorities = sorted(authorities, key=lambda k: k['name'])
+ if self.theme != 'fed4fire':
+ authorities = sorted(authorities, key=lambda k: k['name'])
# Get user_email (XXX Would deserve to be simplified)
user_query = Query().get('local:user').select('email','config')
user_authority = user_config.get('authority','N/A')
# getting the org from authority
for authority in authorities:
- if authority['authority_hrn'] == user_authority:
+ if 'name' in authority and authority['authority_hrn'] == user_authority:
authority_name = authority['name']
# Handle the case when we use only hrn and not name