Ticket #16180: ticket_16180_for_r16345.diff

tests/regressiontests/admin_views/tests.py

@@ -507 +507 @@
         try:
             self.client.get("/test_admin/admin/admin_views/thing/?color__value__startswith=red")
             self.client.get("/test_admin/admin/admin_views/thing/?color__value=red")
+            # allowed explicitly in a custom changelist
+            self.client.get("/test_admin/admin/admin_views/album/?allowed_param=1")
         except SuspiciousOperation:
             self.fail("Filters are allowed if explicitly included in list_filter")
 

tests/regressiontests/admin_views/models.py

@@ -620 +620 @@
     def get_query_set(self, request):
         return self.root_query_set.filter(pk=9999) # Does not exist
 
+class AllowedParamChangeList(ChangeList):
+
+    def get_ignored_lookup_params(self):
+        return super(AllowedParamChangeList, self).get_ignored_lookup_params() + ('allowed_param', )
+
 class GadgetAdmin(admin.ModelAdmin):
     def get_changelist(self, request, **kwargs):
         return CustomChangeList
@@ -706 +711 @@
 class AlbumAdmin(admin.ModelAdmin):
     list_filter = ['title']
 
+    def get_changelist(self, request, **kwargs):
+        return AllowedParamChangeList
+
 class Employee(Person):
     code = models.CharField(max_length=20)
 

django/contrib/admin/views/main.py

@@ -252 +252 @@
                 ordering_fields[idx] = 'desc' if pfx == '-' else 'asc'
         return ordering_fields
 
+    def get_ignored_lookup_params(self):
+        return IGNORED_PARAMS
+
     def get_lookup_params(self, use_distinct=False):
         lookup_params = self.params.copy() # a dictionary of the query string
 
-        for ignored in IGNORED_PARAMS:
+        for ignored in self.get_ignored_lookup_params():
             if ignored in lookup_params:
                 del lookup_params[ignored]