CreateSlice: url and purpose no longer required

[myslice.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 47951a3..9ccaf76 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -11,7 +11,7 @@ from unfold.page                import Page
 from manifold.core.query        import Query
 from manifoldapi.manifoldapi    import execute_admin_query, execute_query
 
-from portal.actions             import is_pi, create_slice, create_pending_slice, clear_user_creds, authority_check_pis
+from portal.actions             import is_pi, create_slice, create_pending_slice, clear_user_creds, authority_check_pis, getAuthorities
 #from portal.forms               import SliceRequestForm
 from unfold.loginrequired       import LoginRequiredAutoLogoutView
 from ui.topmenu                 import topmenu_items_live, the_user
@@ -39,20 +39,23 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
 
         errors = []
         slice_name =''
-        purpose=''
-        url=''
+        #purpose=''
+        #url=''
         authority_hrn = None
         authority_name = None
         # Retrieve the list of authorities
-        #if self.theme == 'fed4fire' or self.theme == 'onelab':
-        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'])
-            #if self.theme != 'fed4fire' or  self.theme != 'onelab':
-            #    authorities = sorted(authorities, key=lambda k: k['name'])
+
+        authorities = getAuthorities(request, admin=True)
+
+        ##if self.theme == 'fed4fire' or self.theme == 'onelab':
+        #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'])
+        #    #if self.theme != 'fed4fire' or  self.theme != 'onelab':
+        #    #    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')
@@ -88,15 +91,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                         user_hrn = account_config.get('user_hrn','N/A')
         #                acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
 
-
-        # checking if pi or not
-        #if acc_auth_cred == {} or acc_auth_cred == 'N/A':
-        #    pi = "is_not_pi"
-        #else:
-        #    pi = "is_pi"
-
-        pi = authority_check_pis (request, user_email)
-        logger.debug("SLICEREQUESTVIEW.PY -----  pi= {}".format(pi))
+        pi = request.session['user']['pi']
 
         # Page rendering
         page = Page(request)
@@ -143,8 +138,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 'authority_hrn'     : authority_hrn,
                 'organization'      : request.POST.get('org_name', ''),
                 'slice_name'        : slice_name,
-                'url'               : request.POST.get('url', ''),
-                'purpose'           : request.POST.get('purpose', ''),
+                #'url'               : request.POST.get('url', ''),
+                #'purpose'           : request.POST.get('purpose', ''),
                 'current_site'      : current_site
             }
 
@@ -179,11 +174,11 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
 
 
     
-            purpose = slice_request['purpose']
-            if purpose is None or purpose == '':
-                errors.append('Experiment purpose is mandatory')
+           # purpose = slice_request['purpose']
+           # if purpose is None or purpose == '':
+           #     errors.append('Experiment purpose is mandatory')
 
-            url = slice_request['url']
+            #url = slice_request['url']
 
             if not errors:
                 if is_pi(request, user_hrn, authority_hrn):
@@ -208,10 +203,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             'topmenu_items': topmenu_items_live('Request a slice', page),
             'errors': errors,
             'slice_name': slice_name,
-            'purpose': purpose,
+            #'purpose': purpose,
             'email': user_email,
             'user_hrn': user_hrn,
-            'url': url,
+            #'url': url,
             'pi': pi,
             'authority_name': authority_name,        
             'authority_hrn': user_authority,