Projects: Management, Slice Request, localStorage, ...

[myslice.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 15e2d74..f9c4636 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -42,7 +42,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         authorities_query = Query.get('authority').select('name', 'authority_hrn')
         authorities = execute_admin_query(wsgi_request, authorities_query)
         if authorities is not None:
-            authorities = sorted(authorities)
+            authorities = sorted(authorities, key=lambda k: k['authority_hrn'])
+            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')
@@ -85,7 +86,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         #else:
         #    pi = "is_pi"
 
-        pi = authority_check_pis (wsgi_request, user_email)       
+        pi = authority_check_pis (wsgi_request, user_email)
+        print "SLICEREQUESTVIEW.PY -----  pi=",pi
 
         # Page rendering
         page = Page(wsgi_request)
@@ -109,6 +111,11 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             if authority_hrn is None:
                 authority_hrn = wsgi_request.POST.get('org_name', '')
 
+            # Handle project if used
+            project = wsgi_request.POST.get('project', None)
+            if project is not None:
+                authority_hrn = project
+
             slice_request = {
                 'type'              : 'slice',
                 'id'                : None,