Ticket #4805: 4805-alt.diff

django/core/paginator.py

@@ -86 +86 @@
 
     hits = property(_get_hits)
     pages = property(_get_pages)
+
+class ObjectPaginatorForPage(ObjectPaginator):
+    """
+    This class is an extension of the ObjectPaginator class with an embedded
+    current page number, which is useful in templates.
+
+    When creating an ``ObjectPaginatorForPage`` object you can also pass it a
+    ``page_number`` argument to specify which page number the paginator should 
+    use. ``page_number`` should use a zero-based index and defaults to ``0``
+    (the first page).
+
+    You can also pass it a ``base`` argument, which determines if the
+    ``page_number``, ``next_page_number`` and ``previous_page_number``
+    properties use zero or one based page indexing. ``base`` defaults to
+    ``1``.
+    """
+    def __init__(self, query_set, num_per_page, orphans=0, page_number=0, base=1):
+        super(ObjectPaginatorForPage, self).__init__(query_set, num_per_page, orphans)
+        self._page_number = page_number
+        self.base = base
+
+    def validate_page_number(self):
+        return super(ObjectPaginatorForPage, self).validate_page_number(self._page_number)
+
+    def get_page(self):
+        return super(ObjectPaginatorForPage, self).get_page(self._page_number)
+
+    def has_next_page(self):
+        return super(ObjectPaginatorForPage, self).has_next_page(self._page_number)
+
+    def has_previous_page(self):
+        return super(ObjectPaginatorForPage, self).has_previous_page(self._page_number)
+
+    def first_on_page(self):
+        return super(ObjectPaginatorForPage, self).first_on_page(self._page_number)
+
+    def last_on_page(self):
+        return super(ObjectPaginatorForPage, self).last_on_page(self._page_number)
+
+    def _get_page_number(self):
+        return base + self._page_number
+    page_number = property(_get_page_number)
+
+    def _get_next_page_number(self):
+        if self.has_next_page():
+            return self.page_number + 1
+    next_page_number = property(_get_next_page_number)
+
+    def _get_previous_page_number(self):
+        if self.has_previous_page():
+            return self.page_number - 1
+    previous_page_number = property(_get_previous_page_number)