X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=318ee347216c7822358b69c40ae437953ab1ebda;hb=4eb7811b5c77672a154fbf86e66a363aed541449;hp=8e103a1ff85d44d57e9500c1bc668e4c4a4da167;hpb=f9d7861ae487f2fa696ea37d16779e5e042e2281;p=unfold.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 8e103a1f..318ee347 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -8,9 +8,8 @@ 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
+from ui.topmenu                      import topmenu_items_live, the_user
 
-from plugins.validatebutton          import ValidateButton
 from plugins.raw                     import Raw
 from plugins.stack                   import Stack
 from plugins.tabs                    import Tabs
@@ -35,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
@@ -97,24 +96,24 @@ class SliceView (LoginRequiredAutoLogoutView):
             
             # 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)
+#            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
@@ -421,23 +420,6 @@ class SliceView (LoginRequiredAutoLogoutView):
                     outline_complete = True,
                     ))
     
-# topmenu animation
-# xxx all this should go into a plugin if its own with the topmenu and all...
-        query_pi_auths = Query.get('ple: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 here
-        validatebutton = ValidateButton (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
-        validatebutton.render(request)
-# end topmenu addition
-
         # variables that will get passed to the view-unfold1.html template
         template_env = {}
         
@@ -447,7 +429,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         # more general variables expected in the template
         template_env [ 'title' ] = '%(slicename)s'%locals()
         # the menu items on the top
-        template_env [ 'topmenu_items' ] = topmenu_items('Slice', request) 
+        template_env [ 'topmenu_items' ] = topmenu_items_live('Slice', page) 
         # so we can sho who is logged
         template_env [ 'username' ] = the_user (request)