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 7f071c0..87a3bfb 100644 (file)
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -33,7 +33,8 @@ class Page:
         # queue of queries with maybe a domid, see enqueue_query
         self._queue=[]
         # global prelude object
-        self.prelude=Prelude(css_files=['css/plugin.css','css/onelab_marko.css',])
+        # global requirements should go in base.html
+        self.prelude=Prelude()
 
     # record known plugins hashed on their domid
     def record_plugin (self, plugin):
@@ -68,6 +69,11 @@ class Page:
         # we only do this if run_it is set
         if run_it: self._queue.append ( (query.query_uuid,domid) )
 
+    def generate_records(self, query, generators, number=10):
+        self.add_js_files('js/record_generator.js');
+        js_chunk = '$(document).ready(function() { new RecordGenerator(%s,%s,%s).run(); });'%(query.to_json(),json.dumps(generators),number);
+        self.add_js_chunks(js_chunk)
+
     # return the javascript code for exposing queries
     # all queries are inserted in the global manifold object
     # in addition, the ones enqueued with 'run_it=True' are triggered 
@@ -106,7 +112,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,7 +121,7 @@ class Page:
     def expose_js_metadata (self):
         # expose global MANIFOLD_METADATA as a js variable
         # xxx this is fetched synchroneously..
-        self.add_js_init_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";")
+        self.add_js_init_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";\n")
 
     def expose_js_manifold_config (self):
         config=Config()