Really need to compute _pagenumber when using orphan

plone · Jul 9, 2015 · 18cc2b7 · 18cc2b7
1 parent 760cf78
commit 18cc2b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/plone/batching/batch.py b/plone/batching/batch.py
@@ -56,22 +56,23 @@ def initialize(self, start, end, size):
         self.end = end
 
         self.first = max(start - 1, 0)
+        if self.beyond:
+            self.first = self.end
+        self.length = self.end - self.first
+
         self.last = self.sequence_length - size
 
         # Set up the total number of pages
         self.numpages = calculate_pagenumber(
             self.sequence_length - self.orphan, self.pagesize, self.overlap)
 
-        if self.beyond:
-            self.first = self.end
-            # Make sure current page number is not > numpages
-            self._pagenumber = self.numpages
-        else:
-            # Set up the current page number
-            self._pagenumber = calculate_pagenumber(
-                self.start, self.pagesize, self.overlap)
+        # Set up the current page number
+        self._pagenumber = calculate_pagenumber(
+            self.start, self.pagesize, self.overlap)
 
-        self.length = self.end - self.first
+        # Make sure self._pagenumber is <= self.numpages
+        if self._pagenumber > self.numpages:
+            self._pagenumber = self.numpages
 
     @property
     def navlist(self):

diff --git a/plone/batching/tests.py b/plone/batching/tests.py
@@ -159,13 +159,13 @@ def test_multiple_pages_longer(self):
     def test_pagenumber_never_over_numpages(self):
         """computed _pagenumber is never > numpages, this
            makes previous_pages not fail."""
-        batch = BaseBatch([1, 2, 3, 4, 5, 6, 7], 3, 8)
+        batch = BaseBatch([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 3, 9)
+        self.assertEquals(batch.previous_pages, [1, 2, 3])
+        self.assertEquals(batch._pagenumber, 4)
+        # works especially with orphan
+        batch = BaseBatch([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 3, 9, orphan=2)
         self.assertEquals(batch.previous_pages, [1, 2])
         self.assertEquals(batch._pagenumber, 3)
-        # works especially with orphan
-        batch = BaseBatch([1, 2, 3, 4, 5, 6, 7], 3, 8, orphan=2)
-        self.assertEquals(batch.previous_pages, [1])
-        self.assertEquals(batch._pagenumber, 2)
 
 
 class TestQuantumBatch(unittest.TestCase):