mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Refs #25513 -- Adjusted admin pagination to be 1-indexed.

Browse Source
This commit is contained in:
Nick Pope
2020-07-30 12:45:32 +01:00
committed by Carlton Gibson
parent ee1ddcbab9
commit b203ec70fd
5 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/admin_changelist/tests.py
View File

@@ -259,7 +259,7 @@ class ChangeListTests(TestCase):
Regression test for #14312: list_editable with pagination
"""
new_parent = Parent.objects.create(name='parent')
for i in range(200):
for i in range(1, 201):
Child.objects.create(name='name %s' % i, parent=new_parent)
request = self.factory.get('/child/', data={'p': -1}) # Anything outside range
request.user = self.superuser
@@ -274,7 +274,7 @@ class ChangeListTests(TestCase):
def test_custom_paginator(self):
new_parent = Parent.objects.create(name='parent')
for i in range(200):
for i in range(1, 201):
Child.objects.create(name='name %s' % i, parent=new_parent)
request = self.factory.get('/child/')
@@ -576,7 +576,7 @@ class ChangeListTests(TestCase):
use queryset set by modeladmin.
"""
parent = Parent.objects.create(name='anything')
for i in range(30):
for i in range(1, 31):
Child.objects.create(name='name %s' % i, parent=parent)
Child.objects.create(name='filtered %s' % i, parent=parent)
@@ -652,7 +652,7 @@ class ChangeListTests(TestCase):
def test_show_all(self):
parent = Parent.objects.create(name='anything')
for i in range(30):
for i in range(1, 31):
Child.objects.create(name='name %s' % i, parent=parent)
Child.objects.create(name='filtered %s' % i, parent=parent)
@@ -969,7 +969,7 @@ class ChangeListTests(TestCase):
custom_site.register(UnorderedObject, UnorderedObjectAdmin)
model_admin = UnorderedObjectAdmin(UnorderedObject, custom_site)
counter = 0 if ascending else 51
for page in range(0, 5):
for page in range(1, 6):
request = self._mocked_authenticated_request('/unorderedobject/?p=%s' % page, superuser)
response = model_admin.changelist_view(request)
for result in response.context_data['cl'].result_list:
@@ -1013,7 +1013,7 @@ class ChangeListTests(TestCase):
custom_site.register(OrderedObject, OrderedObjectAdmin)
model_admin = OrderedObjectAdmin(OrderedObject, custom_site)
counter = 0 if ascending else 51
for page in range(0, 5):
for page in range(1, 6):
request = self._mocked_authenticated_request('/orderedobject/?p=%s' % page, superuser)
response = model_admin.changelist_view(request)
for result in response.context_data['cl'].result_list:
@@ -1245,12 +1245,12 @@ class ChangeListTests(TestCase):
per_page = cl.list_per_page = 10
for page_num, objects_count, expected_page_range in [
(0, per_page, []),
(0, per_page * 2, list(range(2))),
(5, per_page * 11, list(range(11))),
(5, per_page * 12, [0, 1, 2, 3, 4, 5, 6, 7, 8, '.', 10, 11]),
(6, per_page * 12, [0, 1, '.', 3, 4, 5, 6, 7, 8, 9, 10, 11]),
(6, per_page * 13, [0, 1, '.', 3, 4, 5, 6, 7, 8, 9, '.', 11, 12]),
(1, per_page, []),
(1, per_page * 2, list(range(1, 3))),
(6, per_page * 11, list(range(1, 12))),
(6, per_page * 12, [1, 2, 3, 4, 5, 6, 7, 8, 9, '.', 11, 12]),
(7, per_page * 12, [1, 2, '.', 4, 5, 6, 7, 8, 9, 10, 11, 12]),
(7, per_page * 13, [1, 2, '.', 4, 5, 6, 7, 8, 9, 10, '.', 12, 13]),
]:
# assuming we have exactly `objects_count` objects
Group.objects.all().delete()