Updated Service Directory url and cleaned some comments

[unfold.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index d18289f..5eb0725 100644 (file)
--- 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
 
@@ -10,7 +12,7 @@ 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
 
@@ -56,23 +58,38 @@ 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 == {}:
+            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_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
+
             slice_request = {
                 'type'              : 'slice',
                 'id'                : None,
                 'user_hrn'          : user_hrn,
+                'email'             : user_email,
                 'timestamp'         : time.time(),
                 'authority_hrn'     : wsgi_request.POST.get('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 +104,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 +112,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 +125,11 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             'errors': errors,
             'email': user_email,
             'user_hrn': user_hrn,
+            'pi': pi,        
             '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())