Changeset 3040

Timestamp:

05/31/06 23:29:39 (2 years ago)

Author:

adrian

Message:

Fixed #720 -- Added first_on_page() and last_on_page() methods to ObjectPaginator?. Thanks, m@bagai.com

Files:

• django/trunk/django/core/paginator.py (modified) (1 diff)
• django/trunk/tests/modeltests/pagination/models.py (modified) (1 diff)

django/trunk/django/core/paginator.py

@@ -55 +55 @@
-        return page_number > 0
-
+    def first_on_page(self, page_number):
+        """
+        Returns the 1-based index of the first object on the given page,
+        relative to total objects found (hits).
+        """
+        if page_number == 0:
+            return 1
+        return (self.num_per_page * page_number) + 1
+
+    def last_on_page(self, page_number):
+        """
+        Returns the 1-based index of the last object on the given page,
+        relative to total objects found (hits).
+        """
+        if page_number == 0 and self.num_per_page >= self._hits:
+            return self._hits
+        elif page_number == (self._pages - 1) and (page_number + 1) * self.num_per_page > self._hits:
+            return self._hits
+        return (page_number + 1) * self.num_per_page
+
-    def _get_hits(self):
-        if self._hits is None:

django/trunk/tests/modeltests/pagination/models.py

@@ -56 +56 @@
-True
-
+>>> paginator.first_on_page(0)
+1
+>>> paginator.first_on_page(1)
+6
+>>> paginator.last_on_page(0)
+5
+>>> paginator.last_on_page(1)
+9
+
-"""