X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ui%2Ftopmenu.py;h=6fbede50c3510e350fda7b07e21c2ae3d9a60f44;hb=a1e452649acd9538b59dbf728dbc7b7ddec96749;hp=bcf74b1c117bfda3c0905b9d57806c23881bef04;hpb=e662708d2f2f1ba05daefe1db50ee08c5439aadc;p=myslice.git

diff --git a/ui/topmenu.py b/ui/topmenu.py
index bcf74b1c..6fbede50 100644
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -1,3 +1,7 @@
+import json
+from pprint import pprint
+from manifold.manifoldapi       import execute_query
+from manifold.core.query        import Query
 # a set of utilities to help make the global layout consistent across views
 
 # dropdowns are kind of ad hoc for now, and limited to one level
@@ -7,15 +11,52 @@
 # ### a dropdown
 # { 'label': ..., 'href'=..., 'dropdown':True, 'contents': [ { 'label':.., 'href'} ] }
 # , ..]
+
+# current: the beginning of the label in the menu that you want to outline
 def topmenu_items (current,request=None):
     has_user=request.user.is_authenticated()
     result=[]
+    print request.user
     if has_user:
-        result.append({'label':'Platforms', 'href': '/portal/platforms/'})
         result.append({'label':'Dashboard', 'href': '/portal/dashboard/'})
-        # This should probably go in dashboard at some point
+        result.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
+        # ** Where am I a PI **
+        # For this we need to ask SFA (of all authorities) = PI function
+        user_query  = Query().get('local:user').select('config','email')
+        user_details = execute_query(request, user_query)
+
+        # Required: the user must have an authority in its user.config
+        # XXX Temporary solution
+        # not always found in user_details...
+        config={}
+# Deactivated until fixed 
+#        if user_details is not None:
+#            for user_detail in user_details:
+#                #email = user_detail['email']
+#                if user_detail['config']:
+#                    config = json.loads(user_detail['config'])
+#            user_detail['authority'] = config.get('authority',"Unknown Authority")
+#            print "topmenu: %s", (user_detail['authority'])
+#            if user_detail['authority'] is not None:
+#                sub_authority = user_detail['authority'].split('.')
+#                root_authority = sub_authority[0]
+#                pi_authorities_query = Query.get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+#        else:
+#            pi_authorities_query = Query.get('user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+#        try:
+#            pi_authorities_tmp = execute_query(request, pi_authorities_query)
+#        except:
+#            pi_authorities_tmp = set()
+#        pi_authorities = set()
+#        for pa in pi_authorities_tmp:
+#            if 'pi_authorities' in pa:
+#                pi_authorities |= set(pa['pi_authorities'])
+#        print "pi_authorities =", pi_authorities
+#        if len(pi_authorities) > 0:
+#            result.append({'label':'Validation', 'href': '/portal/validate/'})
+        result.append({'label':'Validation', 'href': '/portal/validate/'})
         dropdown = []
-        dropdown.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
+        dropdown.append({'label':'Platforms', 'href': '/portal/platforms/'})
         dropdown.append({'label':'My Account', 'href': '/portal/account/'})
         dropdown.append({'label':'Contact Support', 'href': '/portal/contact/'})
         result.append({'label': 'More', 'href':"#", 'dropdown':True, 'contents':dropdown})
@@ -25,13 +66,19 @@ def topmenu_items (current,request=None):
         result.append({'label':'Platforms', 'href': '/portal/platforms/'})
         result.append({'label':'Register', 'href': '/portal/register/'})
         result.append({'label':'Contact Support', 'href': '/portal/contact/'})
-    # mark active
-    for d in result:
-        if 'dropdown' in d:
-            for dd in d['contents']:
-                if dd['label'] == current: dd['is_active']=True
-        else:
-            if d['label'] == current: d['is_active']=True
+    # mark active if the provided 'current', even if shorter, matches the beginning of d['label']
+    
+    if current is not None:
+        current=current.lower()
+        curlen=len(current)
+        def mark_active(d,up=None):
+            if d['label'][:curlen].lower() == current: 
+                d['is_active']=True
+                if up is not None: up['is_active']=True
+        for d in result:
+            mark_active(d)
+            if 'dropdown' in d:
+                for dd in d['contents']: mark_active(dd,d)
     return result
 
 def the_user (request):