X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=60a95d396c33a16a2a77941e3e9d9bdafa8e3561;hb=1f276736a38c3ada41c48059243604a3db51e309;hp=318ee347216c7822358b69c40ae437953ab1ebda;hpb=d9bbe0a36624c6fe558c05307964be1b3ed4e3b1;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 318ee347..60a95d39 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -59,8 +59,6 @@ class SliceView (LoginRequiredAutoLogoutView):
         config=Config()
         page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
 
-        page.expose_js_metadata()
-
         metadata = page.get_metadata()
         resource_md = metadata.details_by_object('resource')
         resource_fields = [column['name'] for column in resource_md['column']]
@@ -226,7 +224,6 @@ class SliceView (LoginRequiredAutoLogoutView):
             # this is the query at the core of the slice list
             query      = sq_resource,
             query_all  = query_resource_all,
-            # use 'hrn' as the internal unique key for this plugin
             init_key     = main_query_init_key,
             checkboxes = True,
             datatables_options = { 
@@ -244,9 +241,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                 # this is the query at the core of the slice list
                 query      = sq_resource,
                 query_all  = query_resource_all,
-                # use 'hrn' as the internal unique key for this plugin
-                # xxx todo on querygrid as well
-                # init_key     = main_query_init_key,
+                init_key     = main_query_init_key,
                 checkboxes = True,
                 )
 
@@ -434,15 +429,10 @@ class SliceView (LoginRequiredAutoLogoutView):
         template_env [ 'username' ] = the_user (request) 
     
         # don't forget to run the requests
-        page.expose_queries ()
-    
-        # xxx create another plugin with the same query and a different layout (with_datatables)
-        # show that it worls as expected, one single api call to backend and 2 refreshed views
-    
+        page.expose_js_metadata()
         # the prelude object in page contains a summary of the requirements() for all plugins
         # define {js,css}_{files,chunks}
-        prelude_env = page.prelude_env()
-        template_env.update(prelude_env)
-        result=render_to_response ('view-unfold1.html',template_env,
+        template_env.update(page.prelude_env())
+
+        return render_to_response ('view-unfold1.html',template_env,
                                    context_instance=RequestContext(request))
-        return result