X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fslicerequestview.py;fp=portal%2Fslicerequestview.py;h=0c4a5bede8e4db3fb8c2b60d5a92a1d3c783e664;hp=c34a9035586a72f78366e51c2c628a6d37b41472;hb=960addc41d03da7286ded7fc20ad3d87ac9c2771;hpb=171c495d9ea9f10dcc46c236d8655ecfc94a8a20 diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index c34a9035..0c4a5bed 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -14,13 +14,15 @@ from ui.topmenu import topmenu_items, the_user class SliceRequestView (LoginRequiredAutoLogoutView): def authority_hrn_initial (self, request): - #authorities_query = Query.get('authority').\ - # select('name', 'authority_hrn') + # Using cache manifold-tables to get the list of authorities + authorities_query = Query.get('authority').\ + select('name', 'authority_hrn') #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple-onelab').filter_by('disabled', '==', 'False') #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) #if onelab_enabled: - authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple','ple.nitos']) + #authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple','ple.nitos']) + # Now using Cache authorities = execute_admin_query(request, authorities_query) authorities = sorted(authorities)