Ticket #14312: fix14312-1.patch

django/contrib/admin/views/main.py

@@ -116 +116 @@
             try:
                 result_list = paginator.page(self.page_num+1).object_list
             except InvalidPage:
-                result_list = ()
+                result_list = self.root_query_set.none()
 
         self.result_count = result_count
         self.full_result_count = full_result_count

tests/regressiontests/admin_changelist/tests.py

@@ -71 +71 @@
         self.failIf('<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']
+        cl = 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)
+        FormSet = m.get_changelist_formset(request)
+        cl.formset = FormSet(queryset=cl.result_list)
+
+
 class ChildAdmin(admin.ModelAdmin):
     list_display = ['name', 'parent']
     def queryset(self, request):