template_name = 'projectrequest_view.html'
def getAuthorities(self, request):
- if theme.theme == 'fed4fire':
- authorities_query = Query.get('myslice:authority').select('name', 'authority_hrn')
- else:
- authorities_query = Query.get('authority').select('name', 'authority_hrn')
+ #if self.theme == 'fed4fire':
+ 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:
# 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' :
if not errors:
logger.info("is_pi on auth_hrn = {}".format(user_authority))
- if is_pi(wsgi_request, user_hrn, user_authority):
+ if is_pi(wsgi_request, user_hrn, post['authority_hrn']):
# PIs can directly create/join project in their own authority...
if 'join' in wsgi_request.POST:
# join existing project