Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[myslice.git] / unfold / page.py

diff --git a/unfold/page.py b/unfold/page.py
index 02fb9b7..a6ca83c 100644 (file)
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -80,7 +80,7 @@ class Page:
             result={'query_uuid':a}
             if b: result['domid']=b
             return result
-        env['query_publish_dom_tuples'] = [ query_publish_dom_tuple (a,b) for (a,b) in self._queue ]
+        env['query_exec_tuples'] = [ query_publish_dom_tuple (a,b) for (a,b) in self._queue ]
         javascript = render_to_string ("page-queries.js",env)
         self.add_js_chunks (javascript)
 #        self.reset_queue()
@@ -106,7 +106,7 @@ class Page:
         metadata_auth = {'AuthMethod':'anonymous'}
 
         metadata=MetaData (metadata_auth)
-        metadata.fetch()
+        metadata.fetch(self.request)
         # store it for next time
         manifold['metadata']=metadata
         if debug: print "Page.get_metadata: return new value"
@@ -115,11 +115,11 @@ class Page:
     def expose_js_metadata (self):
         # expose global MANIFOLD_METADATA as a js variable
         # xxx this is fetched synchroneously..
-        self.add_js_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";")
+        self.add_js_init_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";")
 
     def expose_js_manifold_config (self):
         config=Config()
-        self.add_js_chunks(config.manifold_js_export())
+        self.add_js_init_chunks(config.manifold_js_export())
 
     #################### requirements/prelude management
     # just forward to self.prelude - see decorator above
@@ -128,6 +128,8 @@ class Page:
     @to_prelude
     def add_css_files (self):pass
     @to_prelude
+    def add_js_init_chunks (self):pass
+    @to_prelude
     def add_js_chunks (self):pass
     @to_prelude
     def add_css_chunks (self):pass