views: Reverse pagination naming

The leading_set contained the page numbers that should be shown trailing
(i.e. on the right of the paginator). This was confusing. Correct it.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/paginator.py b/patchwork/paginator.py
index 570851799f7bfee45e260e95519198fa4b6835a6..5a9e52edc0231adb538a5f2735db419bd3ef74e1 100644 (file)
--- a/patchwork/paginator.py
+++ b/patchwork/paginator.py
@@ -27,7 +27,7 @@ class Paginator(paginator.Paginator):
         if request.user.is_authenticated:
             items_per_page = request.user.profile.items_per_page
 
-        super(Paginator, self).__init__(objects, items_per_page)
+        super().__init__(objects, items_per_page)
 
         try:
             page_no = int(request.GET.get('page', 1))
@@ -52,23 +52,25 @@ class Paginator(paginator.Paginator):
         elif page_no < LEADING_PAGE_RANGE:
             adjacent_start = 1
             adjacent_end = LEADING_PAGE_RANGE_DISPLAYED + 1
-            self.leading_set = [
-                n + pages for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)
+            self.trailing_set = [
+                n + pages
+                for n in reversed(range(0, -NUM_PAGES_OUTSIDE_RANGE, -1))
             ]
         elif page_no >= pages - TRAILING_PAGE_RANGE:
             adjacent_start = pages - TRAILING_PAGE_RANGE_DISPLAYED + 1
             adjacent_end = pages + 1
-            self.trailing_set = [
+            self.leading_set = [
                 n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)
             ]
         else:
             adjacent_start = page_no - ADJACENT_PAGES
             adjacent_end = page_no + ADJACENT_PAGES + 1
             self.leading_set = [
-                n + pages for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)
+                n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)
             ]
             self.trailing_set = [
-                n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)
+                n + pages
+                for n in reversed(range(0, -NUM_PAGES_OUTSIDE_RANGE, -1))
             ]
 
         self.adjacent_set = [
@@ -77,7 +79,6 @@ class Paginator(paginator.Paginator):
             if n > 0 and n <= pages
         ]
 
-        self.leading_set.reverse()
         self.long_page = (
             len(self.current_page.object_list) >= LONG_PAGE_THRESHOLD
         )

diff --git a/patchwork/templates/patchwork/partials/pagination.html b/patchwork/templates/patchwork/partials/pagination.html
index 0767d385f2adf9e7f3982eeedd54940c2c732c75..94be806d2766f237e2535c242e16eb0dfa163c1b 100644 (file)
--- a/patchwork/templates/patchwork/partials/pagination.html
+++ b/patchwork/templates/patchwork/partials/pagination.html
@@ -10,8 +10,8 @@
   <span class="prev-na">&laquo;</span>
 {% endif %}
 
-{% if page.paginator.trailing_set %}
-{% for p in page.paginator.trailing_set %}
+{% if page.paginator.leading_set %}
+{% for p in page.paginator.leading_set %}
   <span class="page"><a href="{% listurl page=p %}" >{{ p }}</a></span>
 {% endfor %}
   …
@@ -25,9 +25,9 @@
 {% endif %}
 {% endfor %}
 
-{% if page.paginator.leading_set %}
+{% if page.paginator.trailing_set %}
   …
-{% for p in page.paginator.leading_set %}
+{% for p in page.paginator.trailing_set %}
   <span class="page"><a href="{% listurl page=p %}">{{ p }}</a></span>
 {% endfor %}
 {% endif %}