From d410c5b23f485794ed4cbc82f6ccfa9aff230a6f Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 16 Dec 2013 12:27:47 +0100 Subject: [PATCH] move related imports as well --- plugins/topmenuvalidation/__init__.py | 4 ++++ ui/topmenu.py | 17 +++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/plugins/topmenuvalidation/__init__.py b/plugins/topmenuvalidation/__init__.py index 6eafaf8c..2006e799 100644 --- a/plugins/topmenuvalidation/__init__.py +++ b/plugins/topmenuvalidation/__init__.py @@ -35,6 +35,10 @@ Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_author return [ 'query_uuid', 'button_domid', ] #################### here is an extract previously in topmenu.py +#import json +#from pprint import pprint +#from manifold.manifoldapi import execute_query +#from manifold.core.query import Query ### # ** 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') diff --git a/ui/topmenu.py b/ui/topmenu.py index 82979d55..4680c21a 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 @@ -52,9 +55,3 @@ 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 -- 2.43.0