Ticket #6860: 0005-Improve-the-new-paginator.2.diff

a/django/core/paginator.py

@@ +1 @@
+from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
+from django.http import Http404
+
-class InvalidPage(Exception):
-    pass
-
+class PageList(object):
+    def __init__(self, paginator):
+        self.curpage = paginator.page(paginator.curpage)
+        self.adjacent_count = paginator.adjacent_count
+
+    def __repr__(self):
+        return '<PageList current: %d - total: %d>' % \
+            (self.curpage.paginator.curpage, self.curpage.paginator.num_pages)
+
+    def _add_range_as_element(self, open, close, start, end):
+        markup = ''
+        for i in range(start, end + 1):
+            page = self.curpage.paginator.page(i)
+            if self.curpage.number == i:
+                markup += '%s<a class="curpage">%d</a>%s' % \
+                    (open, i, close)
+            else:
+                markup += '%s<a href="%s">%d</a>%s' % \
+                    (open, page.url(), i, close)
+        return markup
+
+    def _as_html(self, el, subel_open, subel_close):
+        if not self.curpage.has_other_pages():
+            return u''
+
+        markup = '<%s class="pagelist">' % el
+
+        markup += '%s<%s class="prev-next">' % (subel_open, el)
+        if self.curpage.has_previous():
+            markup += '%s<a href="%s">&laquo; %s</a>%s' % \
+                    (subel_open, self.curpage.previous_page_url(),
+                    _('Previous'), subel_close)
+        if self.curpage.has_next():
+            markup += '%s<a href="%s">%s &raquo;</a>%s' % \
+                    (subel_open, self.curpage.next_page_url(),
+                    _('Next'), subel_close)
+        markup += '</%s>%s' % (el, subel_close)
+        
+        num_pages = self.curpage.paginator.num_pages
+        midstart = max(self.curpage.number - self.adjacent_count, 1)
+        midend = min(self.curpage.number + self.adjacent_count, num_pages)
+
+        if midstart > 1:
+            end = min(self.adjacent_count + 1, midstart - 1)
+            markup += '%s<%s class="start">' % (subel_open, el)
+            markup += self._add_range_as_element(subel_open,
+                    subel_close, 1, end)
+            markup += '</%s>%s' % (el, subel_close)
+
+        markup += '%s<%s class="middle">' % (subel_open, el)
+        markup += self._add_range_as_element(subel_open, subel_close,
+                    midstart, midend)
+        markup += '</%s>%s' % (el, subel_close)
+
+        if midend < num_pages:
+            start = max(num_pages - self.adjacent_count, midend + 1)
+            markup += '%s<%s class="end">' % (subel_open, el)
+            markup += self._add_range_as_element(subel_open, subel_close,
+                    start, self.curpage.paginator.num_pages)
+            markup += '</%s>%s' % (el, subel_close)
+
+        markup += '</%s>' % el
+
+        return mark_safe(markup)
+
+    def as_ul(self):
+        return self._as_html('ul', '<li>', '</li>')
+
+    def as_div(self):
+        return self._as_html('div', '', '')
+
+
-class Paginator(object):
-
+, base_url=None, page_suffix=None, adjacent_count=2, current=None
-        self.object_list = object_list
-        self.per_page = per_page
-        self.orphans = orphans
-        self.allow_empty_first_page = allow_empty_first_page
+        self.base_url = base_url
+        self.page_suffix = page_suffix
+        self.curpage = current
+        self.adjacent_count = adjacent_count
-        self._num_pages = self._count = None
-
-    def validate_number(self, number):
@@ -31 +111 @@
-        top = bottom + self.per_page
-        if top + self.orphans >= self.count:
-            top = self.count
+        if self.curpage is None:
+            self.curpage = number
-        return Page(self.object_list[bottom:top], number, self)
-
+    def page_or_404(self, number):
+        try:
+            return self.page(number)
+        except InvalidPage:
+            raise Http404(_('Invalid page'))
+
-    def _get_count(self):
-        "Returns the total number of objects, across all pages."
-        if self._count is None:
@@ -61 +149 @@
-        return range(1, self.num_pages + 1)
-    page_range = property(_get_page_range)
-
+    def _get_page_list(self):
+        return PageList(self)
+    page_list = property(_get_page_list)
+
-class QuerySetPaginator(Paginator):
-    """
-    Like Paginator, but works on QuerySets.
@@ -95 +187 @@
-    def previous_page_number(self):
-        return self.number - 1
-
+    def next_page_url(self):
+        return Page(self.object_list, self.number + 1, self.paginator).url()
+
+    def previous_page_url(self):
+        return Page(self.object_list, self.number - 1, self.paginator).url()
+
+    def url(self):
+        if self.number == 1:
+            return self.paginator.base_url
+
+        return self.paginator.base_url + self.paginator.page_suffix % self.number
+
-    def start_index(self):
-        """
-        Returns the 1-based index of the first object on this page,