Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed #14312 -- Raising an ``IncorrectLookupParameters`` if t…

…he page number given to an admin change list exceeds the number of the last page. Thanks, mk.

Backport from trunk (r14889).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 33a6201fdf6d3334dbafcafa117959a8e3af91d6 1 parent 49c2f23
@jezdez jezdez authored
View
2  django/contrib/admin/views/main.py
@@ -116,7 +116,7 @@ def get_results(self, request):
try:
result_list = paginator.page(self.page_num+1).object_list
except InvalidPage:
- result_list = ()
+ raise IncorrectLookupParameters
self.result_count = result_count
self.full_result_count = full_result_count
View
23 tests/regressiontests/admin_changelist/tests.py
@@ -1,4 +1,5 @@
from django.contrib import admin
+from django.contrib.admin.options import IncorrectLookupParameters
from django.contrib.admin.views.main import ChangeList
from django.template import Context, Template
from django.test import TransactionTestCase
@@ -71,6 +72,28 @@ def test_result_list_editable_html(self):
self.assertFalse('<td>%s</td>' % editable_name_field == -1,
'Failed to find "name" list_editable field in: %s' % table_output)
+ def test_result_list_editable(self):
+ """
+ Regression test for #14312: list_editable with pagination
+ """
+
+ new_parent = Parent.objects.create(name='parent')
+ for i in range(200):
+ new_child = Child.objects.create(name='name %s' % i, parent=new_parent)
+ request = MockRequest()
+ request.GET['p'] = -1 # Anything outside range
+ m = ChildAdmin(Child, admin.site)
+
+ # Test with list_editable fields
+ m.list_display = ['id', 'name', 'parent']
+ m.list_display_links = ['id']
+ m.list_editable = ['name']
+ self.assertRaises(IncorrectLookupParameters, lambda: \
+ ChangeList(request, Child, m.list_display, m.list_display_links,
+ m.list_filter, m.date_hierarchy, m.search_fields,
+ m.list_select_related, m.list_per_page, m.list_editable, m))
+
+
class ChildAdmin(admin.ModelAdmin):
list_display = ['name', 'parent']
def queryset(self, request):

0 comments on commit 33a6201

Please sign in to comment.
Something went wrong with that request. Please try again.