Ticket #17828: 17828-debug-IncorrectLookupParameters.patch

django/contrib/admin/options.py

@@ -1135 +1135 @@
             # and the 'invalid=1' parameter was already in the query string,
             # something is screwed up with the database, so display an error
             # page.
+            if settings.DEBUG:
+                raise  # We'll let the standard debugging view handle this
             if ERROR_FLAG in request.GET.keys():
                 return SimpleTemplateResponse('admin/invalid_setup.html', {
                     'title': _('Database error'),

django/contrib/admin/views/main.py

@@ -1 +1 @@
 import operator
 
+from django.conf import settings
 from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
 from django.core.paginator import InvalidPage
 from django.db import models
@@ -319 +320 @@
             # are not in the correct type, so we might get FieldError,
             # ValueError, ValidationError, or ? from a custom field that raises
             # yet something else when handed impossible data.
-            raise IncorrectLookupParameters(e)
+            if settings.DEBUG:
+                # Re-raise the original exception to preserve debug information
+                raise
+            else:
+                raise IncorrectLookupParameters(e)
 
         # Use select_related() if one of the list_display options is a field
         # with a relationship and the provided queryset doesn't already have

tests/regressiontests/admin_changelist/tests.py

@@ -1 +1 @@
 from __future__ import with_statement, absolute_import
 
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.options import IncorrectLookupParameters
 from django.contrib.admin.views.main import ChangeList, SEARCH_VAR, ALL_VAR
@@ -142 +143 @@
                     m.list_filter, m.date_hierarchy, m.search_fields,
                     m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m))
 
+    def test_result_list_editable(self):
+        """
+        Regression test for #17828: ensure that settings.DEBUG causes
+        exceptions in ChangeList setup to be re-raised rather than replaced
+        with a generic IncorrectLookupParameters instance
+        """
+
+        request = self.factory.get('/child/')
+        m = ChildAdmin(Child, admin.site)
+
+        class BrokenFilter(admin.SimpleListFilter):
+            title = "Broken Filter"
+            parameter_name = 'broken_filter'
+
+            # Note the absense of the mandatory methods, which will trigger an exception
+
+        def broken_changelist_init():
+            ChangeList(request, Child, m.list_display, m.list_display_links,
+                        m.list_filter + (BrokenFilter, ), m.date_hierarchy,
+                        m.search_fields, m.list_select_related,
+                        m.list_per_page, m.list_max_show_all, m.list_editable,
+                        m)
+
+        ORIG_DEBUG = settings.DEBUG
+        try:
+            settings.DEBUG = False
+            self.assertRaises(IncorrectLookupParameters, broken_changelist_init)
+            settings.DEBUG = True
+            self.assertRaises(NotImplementedError, broken_changelist_init)
+        finally:
+            settings.DEBUG = ORIG_DEBUG
+
     def test_custom_paginator(self):
         new_parent = Parent.objects.create(name='parent')
         for i in range(200):