Link to Validation page in the top menu, limited users to PLE for the GEC18 DEMO

diff --git a/portal/sliceview.py b/portal/sliceview.py
index b41e92c..8461b1a 100644 (file)
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -269,6 +269,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         tab_measurements = Tabs ( page=page,
                                 domid="measurements",
                                 togglable=True,
+                                toggled  = False,
                                 title="Measurements",
                                 outline_complete=True,
                                 sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],

diff --git a/portal/views.py b/portal/views.py
index 997dbfb..65d8ea0 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -302,7 +302,7 @@ class ValidatePendingView(TemplateView):
 
             # ** Where am I a PI **
             # For this we need to ask SFA (of all authorities) = PI function
-            pi_authorities_query = Query.get('user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+            pi_authorities_query = Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
             pi_authorities_tmp = execute_query(self.request, pi_authorities_query)
             pi_authorities = set()
             for pa in pi_authorities_tmp:
@@ -375,7 +375,7 @@ class ValidatePendingView(TemplateView):
         # more general variables expected in the template
         context['title'] = 'Test view that combines various plugins'
         # the menu items on the top
-        context['topmenu_items'] = topmenu_items('Dashboard', self.request) 
+        context['topmenu_items'] = topmenu_items('Validation', self.request) 
         # so we can sho who is logged
         context['username'] = the_user(self.request) 
 

diff --git a/ui/topmenu.py b/ui/topmenu.py
index bdee674..e6250f0 100644 (file)
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -15,6 +15,7 @@ def topmenu_items (current,request=None):
     if has_user:
         result.append({'label':'Dashboard', 'href': '/portal/dashboard/'})
         result.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
+        result.append({'label':'Validation', 'href': '/portal/validate/'})
         dropdown = []
         dropdown.append({'label':'My Account', 'href': '/portal/account/'})
         dropdown.append({'label':'Contact Support', 'href': '/portal/contact/'})