improved pagination

dpgmediamagazines · Jul 27, 2017 · 1b7a520 · 1b7a520
1 parent 4c10862
commit 1b7a520
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/arctic/paginator.py b/arctic/paginator.py
@@ -18,6 +18,12 @@ def num_pages(self):
             return -1
         return super(IndefinitePaginator, self).num_pages
 
+    def page(self, number):
+        number = self.validate_number(number)
+        bottom = (number - 1) * self.per_page
+        top = bottom + self.per_page
+        return self._get_page(self.object_list[bottom:top], number, self)
+
     def _get_page(self, *args, **kwargs):
         return IndefinitePage(*args, **kwargs)
 

diff --git a/arctic/templates/arctic/partials/pagination.html b/arctic/templates/arctic/partials/pagination.html
@@ -5,9 +5,9 @@
     <div class="row paginator-block">
         <div class="col col-auto">
             <div class="pagination-info">
-                {% blocktrans with start=page_obj.start_index end=page_obj.end_index count=paginator.count %}
-                    {{ start }} &ndash; {{ end }} of {{ count }}
-                {% endblocktrans %}
+                {% with start=page_obj.start_index end=page_obj.end_index count=paginator.count %}
+                    {{ start }} &ndash; {{ end }}{% if count != -1 %} {% trans 'of' %} {{ count }}{% endif %}
+                {% endwith %}
             </div>
         </div>
         <div class="col col-auto">

diff --git a/arctic/utils.py b/arctic/utils.py
@@ -253,4 +253,4 @@ def __len__(self):
         return self.count
 
     def __getitem__(self, slice):
-        return self.get(1, 10)
+        return self.get(slice.start, slice.stop)
diff --git a/example/countries/views.py b/example/countries/views.py
@@ -80,7 +80,7 @@ def get(self, page, paginate_by):
 
 
 class CountryListView(DataListView):
-    paginate_by = 11
+    paginate_by = 13
     dataset = CountriesDataSet()
     fields = ['name', 'capital', 'flag']
     ordering_fields = ['name']
@@ -91,7 +91,7 @@ class CountryListView(DataListView):
     permission_required = 'country_view'
 
     def get_context_data(self, **kwargs):
-        # small hack to setup the localhost in the url of the local API
+        # small hack to setup the current host in the url of the local API
         if not self.dataset.url_template.startswith('http'):
             self.dataset.url_template = '{}://{}/{}'.format(
                 self.request.scheme,