X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=1f8ab8b85bfbd4580f88501597913bb929116931;hb=fc73a99025ba9125c5d3aa2264179af0646e6568;hp=e756c3fd3f237e11c054139b94bb1d42fbb1f353;hpb=91744ef8420e44ced5ca0f1238d670933e702bec;p=unfold.git

diff --git a/portal/registrationview.py b/portal/registrationview.py
index e756c3fd..1f8ab8b8 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -7,9 +7,9 @@ from django.template.loader     import render_to_string
 from django.shortcuts           import render
 
 from unfold.page                import Page
-from myslice.viewutils          import topmenu_items
+from ui.topmenu                 import topmenu_items
 
-from manifold.manifoldapi       import execute_query
+from manifold.manifoldapi       import execute_admin_query
 from manifold.core.query        import Query
 
 from portal.models              import PendingUser
@@ -30,10 +30,17 @@ class RegistrationView (View):
         errors = []
 
         authorities_query = Query.get('authority').\
-            filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).\
             select('name', 'authority_hrn')
-        #authorities_query = Query.get('authority').select('authority_hrn')
-        authorities = execute_query(request, authorities_query)
+        
+        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:
+            print "ONELAB ENABLED"
+            authorities_query = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc'])
+        else:
+            print "FIREXP ENABLED"
+
+        authorities = execute_admin_query(request, authorities_query)
         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)