From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 16 Dec 2013 16:26:36 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~59
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7c1abf68ca485c1485543399fb05233069e888f6;hp=7c04804d6757c222ee4cde9e2e37454bb5bc912d;p=unfold.git

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

diff --git a/ui/topmenu.py b/ui/topmenu.py
index 6b152c8b..be21db22 100644
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -81,7 +81,7 @@ def topmenu_items_live (current, page):
         query=query_pi_auths,
         # this one is the target for a $.show() when the query comes back
         button_domid="topmenu-validation")
-        # although the result does not matter, rendering is required for the JS init code to make it in the page
+    # although the result does not matter, rendering is required for the JS init code to make it in the page
     topmenuvalidation.render(request)
 
     return topmenu_items_static (current, request)
diff --git a/unfold/page.py b/unfold/page.py
index 07ce237a..87a3bfb3 100644
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -69,9 +69,10 @@ 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):
+    def generate_records(self, query, generators, number=10):
         self.add_js_files('js/record_generator.js');
-        self.add_js_chunks('$(document).ready(function() { new RecordGenerator(' + query.to_json() + ', ' + json.dumps(generators) + ', 10).run(); });')
+        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