Add orphans support to MultipleObjectMixin

Fixes #7005

2 files changed, 20 insertions, 0 deletions

diff --git a/tests/regressiontests/generic_views/list.py b/tests/regressiontests/generic_views/list.py
index 28d37f0e71..be2721d775 100644
--- a/tests/regressiontests/generic_views/list.py
+++ b/tests/regressiontests/generic_views/list.py
@@ -118,8 +118,26 @@ class ListViewTests(TestCase):
         # Custom pagination allows for 2 orphans on a page size of 5
         self.assertEqual(len(res.context['object_list']), 7)
 
+    def test_paginated_orphaned_queryset(self):
+        self._make_authors(92)
+        res = self.client.get('/list/authors/paginated-orphaned/')
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res.context['page_obj'].number, 1)
+        res = self.client.get(
+            '/list/authors/paginated-orphaned/', {'page': 'last'})
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res.context['page_obj'].number, 3)
+        res = self.client.get(
+            '/list/authors/paginated-orphaned/', {'page': '3'})
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res.context['page_obj'].number, 3)
+        res = self.client.get(
+            '/list/authors/paginated-orphaned/', {'page': '4'})
+        self.assertEqual(res.status_code, 404)
+
     def test_paginated_non_queryset(self):
         res = self.client.get('/list/dict/paginated/')
+
         self.assertEqual(res.status_code, 200)
         self.assertEqual(len(res.context['object_list']), 1)
 
diff --git a/tests/regressiontests/generic_views/urls.py b/tests/regressiontests/generic_views/urls.py
index a212b830a5..4daf53dbaf 100644
--- a/tests/regressiontests/generic_views/urls.py
+++ b/tests/regressiontests/generic_views/urls.py
@@ -133,6 +133,8 @@ urlpatterns = patterns('',
         views.AuthorList.as_view(paginate_by=30)),
     (r'^list/authors/paginated/(?P<page>\d+)/$',
         views.AuthorList.as_view(paginate_by=30)),
+    (r'^list/authors/paginated-orphaned/$',
+        views.AuthorList.as_view(paginate_by=30, paginate_orphans=2)),
     (r'^list/authors/notempty/$',
         views.AuthorList.as_view(allow_empty=False)),
     (r'^list/authors/notempty/paginated/$',