Request slice/project no authority name in fed4fire

[unfold.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 82c6655..70ef4b7 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -37,10 +37,6 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
     def get_or_post  (self, request, method):
         """
         """
-        from django.conf import settings
-        print "_"*80
-        print settings.TEMPLATE_CONTEXT_PROCESSORS
-        print "_"*80
 
         errors = []
         slice_name =''
@@ -49,11 +45,15 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         authority_hrn = None
         authority_name = None
         # Retrieve the list of authorities
-        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:
             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')
@@ -65,7 +65,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             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
@@ -126,7 +126,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             if project is not None and project != '':
                 authority_hrn = project
 
-            slice_name = wsgi_request.POST.get('slice_name', '')
+            slice_name = request.POST.get('slice_name', '')
             if not slice_name or len(slice_name) == 0 :
                 errors.append('Slice name can\'t be empty')
 
@@ -149,7 +149,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
 
             # slice name is unique among all authorities 
             slice_query = Query().get('myslice:slice').select('slice_hrn')
-            slice_details_sfa = execute_admin_query(wsgi_request, slice_query)
+            slice_details_sfa = execute_admin_query(request, slice_query)
             for _slice in slice_details_sfa:
                 split_list = _slice['slice_hrn'].split('.')
                 sfa_slice_name = split_list[-1]