X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=abc9a3a94a519fa26670286148398336de2cc70a;hb=4ffe03690aff813d103a34ed084ae79c4a9dee72;hp=d18289fa804a956c2bde6e188941ce97e34a289f;hpb=d251934bd71c678f552dc9a1d49c3f8efe102e1e;p=unfold.git

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index d18289fa..abc9a3a9 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -1,4 +1,6 @@
 from django.shortcuts           import render
+from django.contrib.sites.models import Site
+
 
 from unfold.page                import Page
 
@@ -6,11 +8,11 @@ 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.forms               import SliceRequestForm
+#from portal.forms               import SliceRequestForm
 from unfold.loginrequired       import LoginRequiredAutoLogoutView
 from ui.topmenu                 import topmenu_items_live, the_user
 
-from theme import ThemeView
+from myslice.theme import ThemeView
 
 import json, time
 
@@ -36,10 +38,19 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         if authorities is not None:
             authorities = sorted(authorities)
 
-        # Get user_hrn (XXX Would deserve to be simplified)
-        user_query  = Query().get('local:user').select('email')
-        user_emails = execute_query(wsgi_request, user_query)
-        user_email = user_emails[0].get('email')
+        # Get user_email (XXX Would deserve to be simplified)
+        user_query  = Query().get('local:user').select('email','config')
+        user_details = execute_query(wsgi_request, user_query)
+        user_email = user_details[0].get('email')
+        # getting user_hrn
+        for user_detail in user_details:
+            user_config = json.loads(user_detail['config'])
+            user_authority = user_config.get('authority','N/A')              
+        # getting the org from authority        
+        for authority in authorities:
+            if authority['authority_hrn'] == user_authority:
+                authority_name = authority['name']
+
         #
         account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
         account_details = execute_query(wsgi_request, account_query)
@@ -56,23 +67,46 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                     if 'myslice' in platform_detail['platform']:
                         account_config = json.loads(account_detail['config'])
                         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"
+
 
         # Page rendering
         page = Page(wsgi_request)
-        page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
+        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" ] )
 
         if method == 'POST':
             # The form has been submitted
+
+            # get the domain url
+            current_site = Site.objects.get_current()
+            current_site = current_site.domain
+            
+            # 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']
+
+            
+
             slice_request = {
                 'type'              : 'slice',
                 'id'                : None,
                 'user_hrn'          : user_hrn,
+                'email'             : user_email,
                 'timestamp'         : time.time(),
-                'authority_hrn'     : wsgi_request.POST.get('authority_hrn', ''),
+                'authority_hrn'     : authority_hrn,
                 'slice_name'        : wsgi_request.POST.get('slice_name', ''),
                 'number_of_nodes'   : wsgi_request.POST.get('number_of_nodes', ''),
-                'type_of_nodes'     : wsgi_request.POST.get('type_of_nodes', ''),
                 'purpose'           : wsgi_request.POST.get('purpose', ''),
+                'current_site'      : current_site
             }
             
             authority_hrn = slice_request['authority_hrn']
@@ -87,7 +121,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             purpose = slice_request['purpose']
             if (purpose is None or purpose == ''):
                 errors.append('Purpose is mandatory')
-    
+
             if not errors:
                 if is_pi(wsgi_request, user_hrn, authority_hrn):
                     # PIs can directly create slices in their own authority...
@@ -95,7 +129,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                     self.template_name = 'slice-request-done-view.html'
                 else:
                     # Otherwise a wsgi_request is sent to the PI
-                    create_pending_slice(wsgi_request, user_email, slice_name, user_hrn, authority_hrn, number_of_nodes, purpose)
+                    create_pending_slice(wsgi_request, slice_request, user_email)
                     self.template_name = 'slice-request-ack-view.html'
                 
                 return render(wsgi_request, self.template, {'theme': self.theme}) # Redirect after POST
@@ -108,9 +142,12 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             'errors': errors,
             'email': user_email,
             'user_hrn': user_hrn,
+            'pi': pi,
+            'authority_name': authority_name,        
             'cc_myself': True,
             'authorities': authorities,
-            'theme': self.theme
+            'theme': self.theme,
+            'section': "Slice request"
         }
         template_env.update(slice_request)
         template_env.update(page.prelude_env())