various

[unfold.git] / unfold / page.py

diff --git a/unfold/page.py b/unfold/page.py
index 157e004..b00194f 100644 (file)
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -61,7 +61,7 @@ class Page:
         # compute variables to expose to the template
         env = {}
         # expose the json definition of all queries
-        env['queries_jsons'] = [ query.to_json() for query in self._queries ]
+        env['queries_json'] = [ query.to_json() for query in self._queries ]
         env['query_uuid_domids'] = [ {'query_uuid' : a, 'domid': '"%s"'%b if b else 'null'} for (a,b) in self._queue ]
         javascript = render_to_string ("page-queries.js",env)
         self.reset_queue()
@@ -93,19 +93,19 @@ class Page:
             results = manifold_api.Get('metadata:table', [], [], fields)
 
             for res in results:
-                 method = res['table']
-                 self._metadata[method] = res
+                 subject = res['table']
+                 self._metadata[subject] = res
 
             request.session['metadata'] = self._metadata
 
-#        javascript = "all_headers=" + json.dumps(self._metadata) + ";"
-#        self.add_js_chunks(javascript)
+        javascript = "var MANIFOLD_METADATA =" + json.dumps(self._metadata) + ";"
+        self.add_js_chunks(javascript)
 
-    def metadata_get_fields(self, method):
-        return self._metadata[method]['column'].sort()
+    def metadata_get_fields(self, subject):
+        return self._metadata[subject]['column'].sort()
         
     def expose_js_manifold_config (self):
-        self.add_js_chunks(Config.manifold_js_export()+"\n")
+        self.add_js_chunks(Config.manifold_js_export())
 
     #################### requirements/prelude management
     # just forward to self.prelude - see decorator above