X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=0f58669a3b09f77a2f65bac192eb0267a2e23e3b;hb=2c1bd9325dc325f82d99807fcdb9d14ae148f167;hp=1bcbc5dc6f2da0ae43e817602fc577d47b2ca141;hpb=4bec211b6b6a2f67c7dedc5351d65e5e5810ca7f;p=myslice.git

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 1bcbc5dc..0f58669a 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -7,7 +7,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
+from portal.actions             import is_pi, create_slice, create_pending_slice, clear_user_creds
 #from portal.forms               import SliceRequestForm
 from unfold.loginrequired       import LoginRequiredAutoLogoutView
 from ui.topmenu                 import topmenu_items_live, the_user
@@ -33,7 +33,9 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         errors = []
         slice_name =''
         purpose=''
-        exp_url=''
+        url=''
+        authority_hrn = None
+        authority_name = None
         # Retrieve the list of authorities
         authorities_query = Query.get('authority').select('name', 'authority_hrn')
         authorities = execute_admin_query(wsgi_request, authorities_query)
@@ -53,6 +55,9 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             if authority['authority_hrn'] == user_authority:
                 authority_name = authority['name']
 
+        # Handle the case when we use only hrn and not name
+        if authority_name is None:
+            authority_name = user_authority
         #
         account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
         account_details = execute_query(wsgi_request, account_query)
@@ -83,6 +88,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         page = Page(wsgi_request)
         page.add_js_files  ( [ "js/jquery.validate.js", "js/jquery-ui.js" ] )
         page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
+        page.expose_js_metadata()
 
         if method == 'POST':
             # The form has been submitted
@@ -91,12 +97,14 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             current_site = Site.objects.get_current()
             current_site = current_site.domain
             
-            # getting the authority_hrn from the selected organization           
+            # getting the authority_hrn from the selected organization
             for authority in authorities:
                 if authority['name'] == wsgi_request.POST.get('org_name', ''):
                     authority_hrn = authority['authority_hrn']
 
-            
+            # Handle the case when we use only hrn and not name
+            if authority_hrn is None:
+                authority_hrn = wsgi_request.POST.get('org_name', '')
 
             slice_request = {
                 'type'              : 'slice',
@@ -107,7 +115,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 'authority_hrn'     : authority_hrn,
                 'organization'      : wsgi_request.POST.get('org_name', ''),
                 'slice_name'        : wsgi_request.POST.get('slice_name', ''),
-                'exp_url'           : wsgi_request.POST.get('exp_url', ''),
+                'url'               : wsgi_request.POST.get('url', ''),
                 'purpose'           : wsgi_request.POST.get('purpose', ''),
                 'current_site'      : current_site
             }
@@ -122,10 +130,6 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 if _slice['slice_hrn'] == req_slice_hrn:
                     errors.append('Slice already exists. Please use a different slice name.')
             
-            exp_url = slice_request['exp_url']
-           
-            if (authority_hrn is None or authority_hrn == ''):
-                errors.append('Please, select an organization')
 
             # What kind of slice name is valid?
             if (slice_name is None or slice_name == ''):
@@ -133,16 +137,24 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             
             if (re.search(r'^[A-Za-z0-9_]*$', slice_name) == None):
                 errors.append('Slice name may contain only letters, numbers, and underscore.')
+            
+            organization = slice_request['organization']    
+            if (organization is None or organization == ''):
+                errors.append('Organization is mandatory')
+
 
     
             purpose = slice_request['purpose']
             if (purpose is None or purpose == ''):
-                errors.append('Purpose is mandatory')
+                errors.append('Experiment purpose is mandatory')
+
+            url = slice_request['url']
 
             if not errors:
                 if is_pi(wsgi_request, user_hrn, authority_hrn):
                     # PIs can directly create slices in their own authority...
                     create_slice(wsgi_request, slice_request)
+                    clear_user_creds(wsgi_request, user_email)
                     self.template_name = 'slice-request-done-view.html'
                 else:
                     # Otherwise a wsgi_request is sent to the PI
@@ -161,9 +173,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             'purpose': purpose,
             'email': user_email,
             'user_hrn': user_hrn,
-            'exp_url': exp_url,
+            'url': url,
             'pi': pi,
             'authority_name': authority_name,        
+            'authority_hrn': user_authority,        
             'cc_myself': True,
             'authorities': authorities,
             'theme': self.theme,