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

diff --git a/ui/topmenu.py b/ui/topmenu.py
index 860e180b..6fbede50 100644
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -1,3 +1,4 @@
+import json
 from pprint import pprint
 from manifold.manifoldapi       import execute_query
 from manifold.core.query        import Query
@@ -15,22 +16,45 @@ from manifold.core.query        import Query
 def topmenu_items (current,request=None):
     has_user=request.user.is_authenticated()
     result=[]
+    print request.user
     if has_user:
         result.append({'label':'Dashboard', 'href': '/portal/dashboard/'})
         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
-        pi_authorities_query = Query.get('ple: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:
-            pi_authorities |= set(pa['pi_authorities'])
-        print "pi_authorities =", pi_authorities
-        if len(pi_authorities) > 0:
-            result.append({'label':'Validation', 'href': '/portal/validate/'})
+        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':'Platforms', 'href': '/portal/platforms/'})
         dropdown.append({'label':'My Account', 'href': '/portal/account/'})