Reg+Slicereq: incase of authorities is None, it displays the form

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 9cc0cc3..e068aec 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -46,7 +46,8 @@ class RegistrationView (FreeAccessView):
             print "FIREXP ENABLED"
 
         authorities = execute_admin_query(request, authorities_query)
             print "FIREXP ENABLED"
 
         authorities = execute_admin_query(request, authorities_query)

-        authorities = sorted(authorities)
+        if authorities is not None:
+            authorities = sorted(authorities)

         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 
         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index ee94738..5b49607 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -30,7 +30,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
         # Using cache manifold-tables to get the list of authorities faster
         authorities_query = Query.get('authority').select('name', 'authority_hrn')
         authorities = execute_admin_query(request, authorities_query)
         # Using cache manifold-tables to get the list of authorities faster
         authorities_query = Query.get('authority').select('name', 'authority_hrn')
         authorities = execute_admin_query(request, authorities_query)

-        authorities = sorted(authorities)
+        if authorities is not None:
+            authorities = sorted(authorities)

 
         user_query  = Query().get('local:user').select('email')
         user_email = execute_query(self.request, user_query)
 
         user_query  = Query().get('local:user').select('email')
         user_email = execute_query(self.request, user_query)