Fixed a crash when you used a custom paginator in django 2.0+

Author: boxed

HISTORY.rst

@@ -1,7 +1,13 @@
 Changelog
 ---------
 
-6.2.0 (2019-02-18)
+6.2.1 (2019-03-05)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed a crash when you used a custom paginator in django 2.0+
+
+
+6.2.0 (2019-03-04)
 ~~~~~~~~~~~~~~~~~~
 
 * Fixes for jinja2 compatibility (still not fully working)

lib/tri/table/__init__.py

@@ -26,7 +26,7 @@
 
 from tri.table.db_compat import setup_db_compat
 
-__version__ = '6.2.0'  # pragma: no mutate
+__version__ = '6.2.1'  # pragma: no mutate
 
 LAST = LAST
 
@@ -1473,15 +1473,11 @@ def table_context(request,
             pass
         if paginator is None:
             paginator = Paginator(table.data, paginate_by)
-            object_list = None
-        else:  # pragma: no cover
-            object_list = table.data
         if not page:
             page = request.GET.get('page')  # None is translated to the default page in paginator.get_page
         try:
             page_obj = paginator.get_page(page)
-            if object_list is None:
-                table.data = page_obj.object_list
+            table.data = page_obj.object_list
         except (InvalidPage, ValueError):  # pragma: no cover
             raise Http404
 

tests/test_tri_table.py

@@ -4,6 +4,7 @@
 
 import json
 
+import django
 from django.db.models import QuerySet
 from django.http import HttpResponse
 from django.template import Template
@@ -683,6 +684,49 @@ class TestTable(Table):
         </table>""")
 
 
+@pytest.mark.skipif(django.VERSION[0] < 2, reason='This requires the new paginator API in django 2.0+')
+@pytest.mark.django_db
+def test_django_table_pagination_custom_paginator():
+
+    for x in range(30):
+        Foo(a=x, b="foo").save()
+
+    class TestTable(Table):
+        a = Column.number(sortable=False)  # turn off sorting to not get the link with random query params
+        b = Column(show=False)  # should still be able to filter on this though!
+
+    from django.core.paginator import Paginator
+
+    class CustomPaginator(Paginator):
+        def __init__(self, object_list):
+            super(CustomPaginator, self).__init__(object_list=object_list, per_page=2)
+
+        def get_page(self, number):
+            del number
+            return self.page(2)
+
+    data = Foo.objects.all().order_by('pk')
+    verify_table_html(
+        table=TestTable(data=data),
+        paginator=CustomPaginator(data),
+        expected_html="""
+        <table class="listview">
+            <thead>
+                <tr>
+                    <th class="first_column subheader"> A </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr data-pk="3">
+                    <td class="rj"> 2 </td>
+                </tr>
+                <tr data-pk="4">
+                    <td class="rj"> 3 </td>
+                </tr>
+            </tbody>
+        </table>""")
+
+
 def test_links():
     class TestTable(NoSortTable):
         foo = Column(header__attrs__title="Some title")