Ticket #1795: 1795.diff

django/core/paginator.py

@@ -20 +20 @@
         self.num_per_page = num_per_page
         self.orphans = orphans
         self._hits = self._pages = None
+        self._page_range = None
 
     def validate_page_number(self, page_number):
         try:
@@ -83 +84 @@
                 hits = 0
             self._pages = hits // self.num_per_page + 1
         return self._pages
+    
+    def _get_page_range(self):
+        """Returns a 1-based range of pages for iterating through within a template for loop."""
+        if self._page_range is None:
+            self._page_range = range(1, self._pages + 1)
+        return self._page_range
 
     hits = property(_get_hits)
     pages = property(_get_pages)
+    page_range = property(_get_page_range)

django/views/generic/list_detail.py

@@ -67 +67 @@
             'first_on_page': paginator.first_on_page(page - 1),
             'pages': paginator.pages,
             'hits' : paginator.hits,
+            'page_range' : paginator.page_range
         }, context_processors)
     else:
         c = RequestContext(request, {

docs/generic_views.txt

@@ -762 +762 @@
     * ``hits``: The total number of objects across *all* pages, not just this
       page.
 
+    * ``page_range``: A list of the page numbers starting at 1, ideal for ``for``
+      loops.
+
 Notes on pagination
 ~~~~~~~~~~~~~~~~~~~
 
@@ -778 +781 @@
 
         /objects/?page=3
 
+    * To loop over the possible page numbers use the ``page_range`` variable,
+      for example, to place a link for every page.
+
 In both cases, ``page`` is 1-based, not 0-based, so the first page would be
 represented as page ``1``.
 

tests/modeltests/pagination/models.py

@@ -77 +77 @@
 >>> paginator = ObjectPaginator(Article.objects.all(), 10, orphans=1)
 >>> paginator.pages
 2
+>>> paginator.page_range
+[1, 2]
 """}