X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=03b42ae02077d7c01d23584c7f6be40dbbc6bc29;hb=b932fc56d413781f414819c67ade7e69b707d1fb;hp=213fd3181c3250f0ed49b48fc4f3f62bb9fc8e0b;hpb=c6f93b963d9ac30a0b7754b45aeba216ccea1ef9;p=unfold.git diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 213fd318..03b42ae0 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -8,7 +8,7 @@ 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 @@ -58,10 +58,20 @@ 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 @@ -74,11 +84,11 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): '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 } @@ -116,6 +126,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 'errors': errors, 'email': user_email, 'user_hrn': user_hrn, + 'pi': pi, 'cc_myself': True, 'authorities': authorities, 'theme': self.theme,