X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sample%2Ftopmenuvalidationview.py;h=e14efb848ada39fa32fc39c61e8cc28f2d9fb5f3;hb=0300e4a519eb44fa1e2b769f1c871471ebfe0620;hp=4f33dda13e031a5635470718fc241757ad958abc;hpb=7ad1e085bc705fddbf06357582afd42d03f4e5da;p=myslice.git

diff --git a/sample/topmenuvalidationview.py b/sample/topmenuvalidationview.py
index 4f33dda1..e14efb84 100644
--- a/sample/topmenuvalidationview.py
+++ b/sample/topmenuvalidationview.py
@@ -7,9 +7,9 @@ from manifold.core.query import Query, AnalyzedQuery
 
 from unfold.page import Page
 
-from ui.topmenu import topmenu_items, the_user
+from ui.topmenu import topmenu_items_live, the_user
 
-from plugins.topmenuvalidation import TopmenuValidation
+from myslice.settings import logger
 
 class TopmenuValidationView (TemplateView):
 
@@ -20,24 +20,6 @@ class TopmenuValidationView (TemplateView):
 
         page=Page(request)
 
-        query_pi_auths = Query.get('ple:user').filter_by('user_hrn', '==', username ).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
-        topmenuvalidation = TopmenuValidation (
-            page=page, 
-            # see above
-            domid='topmenu-validation',
-            query=query_pi_auths,
-            # this one is the target for enabling when the query comes back
-            button_domid="topmenu-validation")
-        # there is a need to call render() for exposing the query and creating the js plugin
-        # even though this returns an empty string
-        topmenuvalidation.render(request)
-
-
         # variables that will get passed to the view-unfold1.html template
         template_env = {}
         
@@ -47,20 +29,17 @@ class TopmenuValidationView (TemplateView):
         # more general variables expected in the template
         template_env [ 'title' ] = 'simple topmenuvalidation %(username)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 see who is logged
         template_env [ 'username' ] = the_user (request) 
     
-        # don't forget to run the requests
-        page.expose_queries ()
-
         # the prelude object in page contains a summary of the requirements() for all plugins
         # define {js,css}_{files,chunks}
         prelude_env = page.prelude_env()
 
-#        print prelude_env.keys()
+#        logger.info(prelude_env.keys())
 #        for k in [ 'js_files' ] :
-#            print 'prelude_env',prelude_env,k,prelude_env[k]
+#            logger.info('prelude_env {} {} {}'.format(prelude_env,k,prelude_env[k]))
 
         template_env.update(prelude_env)
         result=render_to_response ('view-unfold1.html',template_env,