X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ui%2Ftopmenu.py;h=b0ff707f0fd1f8f755adc89a19513313291aff66;hb=36f0a2f013dc861c84f2f2781ccffa05228759a7;hp=d0238788f6b49a09e28ac94ee5ce22e3c0bfcab0;hpb=69482802ee8c2bef1323ba7b95ba5e629d11fa91;p=myslice.git diff --git a/ui/topmenu.py b/ui/topmenu.py index d0238788..b0ff707f 100644 --- a/ui/topmenu.py +++ b/ui/topmenu.py @@ -1,9 +1,12 @@ -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 +def the_user (request): + "retrieves logged in user's email, or empty string" + if not request.user.is_authenticated (): + return '' + else: + return request.user.email + # dropdowns are kind of ad hoc for now, and limited to one level # [ # ### a regular first-level button @@ -13,53 +16,18 @@ from manifold.core.query import Query # , ..] # see also templates/widget-topmenu.html for how these items are put together -# and plugins/validatebutton for how this hident button is turned on when necessary +# and plugins/topmenuvalidation for how this hident button is turned on when necessary # current: the beginning of the label in the menu that you want to outline -def topmenu_items (current,request=None): +def topmenu_items_static (current, request): 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 -### 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/'}) # always create a disabled button for validation, and let the - # validatebutton plugin handle that asynchroneously, based on this domid + # topmenuvalidation plugin handle that asynchroneously, based on this domid result.append({'label':'Validation', 'href': '/portal/validate/', 'domid':'topmenu-validation', 'disabled':True}) dropdown = [] dropdown.append({'label':'Platforms', 'href': '/portal/platforms/'}) @@ -71,9 +39,10 @@ def topmenu_items (current,request=None): # looks like this is accessible to non-logged users result.append({'label':'Platforms', 'href': '/portal/platforms/'}) result.append({'label':'Register', 'href': '/portal/register/'}) + result.append({'label':'Join us', 'href': '/portal/join/'}) result.append({'label':'Contact Support', 'href': '/portal/contact/'}) + # 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) @@ -87,9 +56,34 @@ def topmenu_items (current,request=None): for dd in d['contents']: mark_active(dd,d) return result -def the_user (request): - "retrieves logged in user's email, or empty string" - if not request.user.is_authenticated (): - return '' - else: - return request.user.email +# tmp - transition phase +def topmenu_items (current, request): + print "WARNING -- please now use topmenu_items_live (label, page) toplevel_items is deprecated -- WARNING" + return topmenu_items_static (current, request) + +# integrated helper function for an animated menu +from unfold.page import Page +from manifold.core.query import Query +from plugins.topmenuvalidation import TopmenuValidation + +### this is now the 'live' version, that has plugins +# for asynchronous management of topmenu +def topmenu_items_live (current, page): + request=page.request + query_pi_auths = Query.get('user').filter_by('user_hrn', '==', '$user_hrn' ).select('pi_authorities') + page.enqueue_query(query_pi_auths) +# # even though this plugin does not have any html materialization, the corresponding domid +# # must exist because it is searched at init-time to create the JS plugin +# # so we simply piggy-back the target button created in the topmenu + topmenuvalidation = TopmenuValidation ( + page=page, + # see above + domid='topmenu-validation', + query=query_pi_auths, + # this one is the target for a $.show() when the query comes back + button_domid="topmenu-validation") + # although the result does not matter, rendering is required for the JS init code to make it in the page + topmenuvalidation.render(request) + + return topmenu_items_static (current, request) +