Ticket #3391: generic_object_list.2.patch

django/core/paginator.py

@@ -19 +19 @@
         self.query_set = query_set
         self.num_per_page = num_per_page
         self.orphans = orphans
-        self._hits = self._pages = None
+        self._hits = self._pages = self._page_numbers = None
 
     def validate_page_number(self, page_number):
         try:
@@ -82 +82 @@
             if hits < 1:
                 hits = 0
             self._pages = hits // self.num_per_page + 1
+            self._page_numbers = range(1, self._pages+1)
         return self._pages
+    
+    def _get_page_numbers(self):
+        if self._page_numbers is None:
+            self._get_pages()
+        return self._page_numbers    
 
     hits = property(_get_hits)
     pages = property(_get_pages)
+    page_numbers = property(_get_page_numbers)

django/views/generic/list_detail.py

@@ -48 +48 @@
                 object_list = []
             else:
                 raise Http404
+                
         c = RequestContext(request, {
             '%s_list' % template_object_name: object_list,
             'is_paginated': paginator.pages > 1,
@@ -58 +59 @@
             'next': page + 1,
             'previous': page - 1,
             'pages': paginator.pages,
+            'page_numbers': paginator.page_numbers,
+            'page_first_item_num': paginator.first_on_page(page - 1),
+            'page_last_item_num': paginator.last_on_page(page - 1),
             'hits' : paginator.hits,
         }, context_processors)
     else:

docs/generic_views.txt

@@ -754 +754 @@
 
     * ``pages``: The total number of pages, as an integer.
 
+    * ``page_numbers``: The list of page numbers (integers).
+
+    * ``page_first_item_num``: The number of the first item on the page.
+
+    * ``page_last_item_num``: The number of the last item on the page.
+
     * ``hits``: The total number of objects across *all* pages, not just this
       page.