From: Loic Baron Date: Fri, 13 Dec 2013 17:36:10 +0000 (+0100) Subject: deactivated hide/show validation link in topmenu.py X-Git-Tag: myslice-0.3-0~90 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=a1e452649acd9538b59dbf728dbc7b7ddec96749 deactivated hide/show validation link in topmenu.py --- diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py index a80a220c..f8c33f98 100644 --- a/manifold/manifoldapi.py +++ b/manifold/manifoldapi.py @@ -134,7 +134,9 @@ def _execute_query(request, query, manifold_api_session_auth): if result['code'] == 2: # XXX only if we know it is the issue del request.session['manifold'] - raise Exception, 'Error running query: %r' % result + # Flush django session + request.session.flush() + #raise Exception, 'Error running query: %r' % result if result['code'] == 1: print "WARNING" @@ -147,6 +149,7 @@ def _execute_query(request, query, manifold_api_session_auth): def execute_query(request, query): if not 'manifold' in request.session or not 'auth' in request.session['manifold']: + request.session.flush() raise Exception, "User not authenticated" manifold_api_session_auth = request.session['manifold']['auth'] return _execute_query(request, query, manifold_api_session_auth) diff --git a/portal/dashboardview.py b/portal/dashboardview.py index 44a3ea91..65826bd0 100644 --- a/portal/dashboardview.py +++ b/portal/dashboardview.py @@ -1,4 +1,7 @@ +import json from manifold.core.query import Query +from manifold.manifoldapi import execute_query + from unfold.page import Page from plugins.lists.testbedlist import TestbedList @@ -21,11 +24,29 @@ class DashboardView (LoginRequiredAutoLogoutView): #messages.info(self.request, 'You have logged in') page = Page(self.request) + print "Dashboard page" # Slow... #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn') testbed_query = Query().get('network').select('network_hrn','platform') # DEMO GEC18 Query only PLE - slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn') + user_query = Query().get('local:user').select('config','email') + user_details = execute_query(self.request, user_query) + + # not always found in user_details... + config={} + 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 user_detail + if user_detail['authority'] is not None: + sub_authority = user_detail['authority'].split('.') + root_authority = sub_authority[0] + slice_query = Query().get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn') + else: + slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn') page.enqueue_query(slice_query) page.enqueue_query(testbed_query) diff --git a/portal/sliceview.py b/portal/sliceview.py index 09e44339..032b6485 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -1,3 +1,4 @@ +import json from django.template import RequestContext from django.shortcuts import render_to_response @@ -5,6 +6,7 @@ from unfold.loginrequired import LoginRequiredAutoLogoutView from unfold.page import Page from manifold.core.query import Query, AnalyzedQuery +from manifold.manifoldapi import execute_query from ui.topmenu import topmenu_items, the_user @@ -32,8 +34,8 @@ from myslice.config import Config tmp_default_slice='ple.upmc.myslicedemo' # temporary : turn off the users part to speed things up -#do_query_users=True -do_query_users=False +do_query_users=True +#do_query_users=False #do_query_leases=True do_query_leases=False @@ -80,14 +82,37 @@ class SliceView (LoginRequiredAutoLogoutView): #main_query_key = 'hrn' query_resource_all = Query.get('resource').select(resource_fields) - if do_query_users: - query_user_all = Query.get('user').select(user_fields) - + aq = AnalyzedQuery(main_query, metadata=metadata) page.enqueue_query(main_query, analyzed_query=aq) page.enqueue_query(query_resource_all) if do_query_users: - page.enqueue_query(query_user_all) + # Required: the user must have an authority in its user.config + # XXX Temporary solution + user_query = Query().get('local:user').select('config','email') + user_details = execute_query(self.request, user_query) + + # not always found in user_details... + config={} + 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") + + if user_detail['authority'] is not None: + sub_authority = user_detail['authority'].split('.') + root_authority = sub_authority[0] + query_user_all = Query.get(root_authority+':user').select(user_fields) + + # XXX TODO this filter doesn't work - to be improved in Manifold + #.filter_by('authority.authority_hrn', '=', user_detail['authority']) + + page.enqueue_query(query_user_all) + else: + print "authority of the user is not in local:user db" + query_user_all = Query.get('user').select(user_fields) + # query_user_all = None # ... and for the relations # XXX Let's hardcode resources for now @@ -261,7 +286,7 @@ class SliceView (LoginRequiredAutoLogoutView): # -------------------------------------------------------------------------- # USERS - if do_query_users: + if do_query_users and query_user_all is not None: tab_users = Tabs( page = page, domid = 'users', 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/'})