Changeset 3824

Timestamp:

12/15/07 08:50:16 (7 months ago)

Author:

roger

Message:

fix #1629

Files:

• branches/1.0/CHANGELOG.txt (modified) (4 diffs)
• branches/1.0/turbogears/paginate.py (modified) (2 diffs)
• branches/1.0/turbogears/tests/test_paginate.py (modified) (7 diffs)

branches/1.0/CHANGELOG.txt

@@ -6 +6 @@
-------
-
+Changes
+~~~~~~~
+
+* Pagination can be disabled by using ``allow_limit_override`` and 
+  ``tg_paginate_limit=0``, allowing all results been returned on one single 
+  page (#1629).
+
-Fixes
-~~~~~
-
-* Fixed VisitFilter when Identity is on and there are list parameters (#1622).
+* Paginate does a better handling of zeroed limit, avoiding ZeroDivisionError
+  exception (#1629).
+
+Contributors
+~~~~~~~~~~~~
+
+Toshio Kuratomi.
-
-
@@ -18 +32 @@
-~~~~~~~~~~~~
-
- 
+
-  ``default_reversed`` parameter has been deprecated. It will still be used
-  if it is informed, but a DeprecationWarning will be displayed.
@@ -32 +46 @@
-  to compute the correct last page number at server-side (#1617).
-* The ``start-<project>.py`` script in a quickstarted project is now only a
- 
+
-  project's package. The ``setup.py`` in new project also creates a console
-  script entry point for this, so easy_install can create a start script
@@ -57 +71 @@
-  last page is requested, respectively.
-* Paginate ``default_order`` can now be a string or a list of strings.
-
- 
+s
+
-  have its default ordering reversed (#1618).
- 
+
-  same key (#1456).
-

branches/1.0/turbogears/paginate.py

@@ -161 +161 @@
-                else:
-                    df = default_order
-
+
-                ordering = dict([(v.lstrip('-'), [k, not v.startswith('-')])
-                                 for k,v in enumerate(df)])
@@ -200 +200 @@
-                    'Variable is not a list or SelectResults or Query (%s)' % type(
-                            var_data))
+
+            # If limit is zero then return all our rows
+            if not limit_:
+                limit_ = row_count or 1
-
-            page_count = int(ceil(float(row_count)/limit_))

branches/1.0/turbogears/tests/test_paginate.py

@@ -257 +257 @@
-
-        def empty(self):
-limit=4, 
+
-                      order=None, ordering={}, row_count=0,
-                      current_page=1, first_item=0, last_item=0)
-            data = []
-            return dict(data=data, spy=spy)
-
+, allow_limit_override=True
-        empty = expose()(empty)
-    # end of MyRoot ------------------------------------------------------------
@@ -401 +401 @@
-        for number in range(4, 7):
-            self.request("/basic/?tg_paginate_no=%s" % number)
-            print self.body
-            assert '"data": [8, 9]' in self.body
-            Spy.assert_ok(self.body, 'current_page', 3)
@@ -409 +408 @@
-    def test_last_page(self):
-        self.request("/basic/?tg_paginate_no=last")
-        print self.body
-        assert '"data": [8, 9]' in self.body
-        Spy.assert_ok(self.body, 'current_page', 3)
@@ -461 +459 @@
-    def test_empty_data(self):
-        self.request("/empty")
+        assert '"data": []' in self.body
+        Spy.assert_ok(self.body, 'limit', 4)
+
+    def test_zero_limit(self):
+        self.request("/custom_limit/?data_tgp_limit=0")
+        assert '"data": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]' in self.body
+        Spy.assert_ok(self.body, 'page_count', 1)
+        Spy.assert_ok(self.body, 'limit', 10)
+        Spy.assert_ok(self.body, 'pages', [1])
+
+    def test_empty_data_zero_limit(self):
+        self.request("/empty/?data_tgp_limit=0")
-        print self.body
-        assert '"data": []' in self.body
+        Spy.assert_ok(self.body, 'page_count', 0)
+        Spy.assert_ok(self.body, 'limit', 1)
-
-
@@ -590 +602 @@
-        related = expose("turbogears.tests.paginate")(related)
-
+        def zero_limit(self, method=None):
+            if method == "Q":
+                data = session.query(Address)
+            elif method == "SR":
+                data = SASelectResults(session.query(Address))
+            elif method == "SO":
+                data = SOAddress.select()
+            else:
+                raise Exception("Invalid method")
+
+            spy = Spy(var_name='data', pages=[1], limit=16, page_count=1,
+                      order=None, row_count=16)
+            return dict(data=data, spy=spy)
+
+        zero_limit = paginate("data", default_order="id", limit=0)(zero_limit)
+        zero_limit = expose("turbogears.tests.paginate")(zero_limit)
+
-    # end of MyRoot ------------------------------------------------------------
-
@@ -666 +695 @@
-        for method in "Q", "SR", "SO":
-            self.request("/wrong_reversed/?method=%s" % method)
-            print self.body
-            assert 'StandardError: default_reversed (deprecated) is only  allowed' in self.body
-
@@ -862 +890 @@
-        self.assert_order(2, 14, 13, 10, 5, 1)
-        Spy.assert_ok(self.body, 'ordering', {'user.occupation.name': [0, False], 'id': [1, False]})
+
+    def test_zero_limit(self):
+        for method in "Q", "SR", "SO":
+            self.request("/zero_limit/?method=%s" % method)
+            self.assert_order(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
-
-