X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=5eb0725f7b2e1c7cf5f26969c12f4eb4c91d907f;hb=37f257599d0d5d754b10c33f4362c1f3cbb563da;hp=1f377d8471a62edf7b3429ab668f5e00fc3b32d2;hpb=d08e5d9101b056425d1a00d2b7b434ee31eada74;p=unfold.git diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 1f377d84..5eb0725f 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 @@ -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'] @@ -108,6 +125,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 'errors': errors, 'email': user_email, 'user_hrn': user_hrn, + 'pi': pi, 'cc_myself': True, 'authorities': authorities, 'theme': self.theme,