Merge branch 'bug-549430' into development

apps/sumo/helpers.py

@@ -45,7 +45,7 @@ class Paginator(object):
         self.count = pager.paginator.count
 
         pager.page_range = self.range()
-        pager.dotted_upper = self.count not in pager.page_range
+        pager.dotted_upper = self.num_pages not in pager.page_range
         pager.dotted_lower = 1 not in pager.page_range
 
     def range(self):

templates/layout/paginator.html

@@ -9,7 +9,9 @@
     {% endif %}
     {% if pager.dotted_lower %}
       <li><a href="{{ pager.url|urlparams(page=1) }}">{{ 1 }}</a></li>
-      <li class="skip">&hellip;</li>
+      {% if pager.page_range[0] != 2 %}
+        <li class="skip">&hellip;</li>
+      {% endif %}
     {% endif %}
     {% for x in pager.page_range %}
     <li {{ x|class_selected(pager.number) }}>
@@ -17,7 +19,9 @@
     </li>
     {% endfor %}
     {% if pager.dotted_upper %}
-      <li class="skip">&hellip;</li>
+      {% if pager.page_range[-1] != num_pages-1 %}
+        <li class="skip">&hellip;</li>
+      {% endif %}
       <li><a href="{{ pager.url|urlparams(page=num_pages) }}">{{ num_pages }}</a></li>
     {% endif %}
     {% if pager.has_next() %}