Ticket #14999: 14999-trunk.diff

django/contrib/admin/options.py

@@ -213 +213 @@
         if len(parts) > 1 and parts[-1] in QUERY_TERMS:
             parts.pop()
 
-        # Special case -- foo__id__exact and foo__id queries are implied
-        # if foo has been specificially included in the lookup list; so
-        # drop __id if it is the last part. However, first we need to find
-        # the pk attribute name.
-        model = self.model
-        pk_attr_name = None
-        for part in parts[:-1]:
-            field, _, _, _ = model._meta.get_field_by_name(part)
-            if hasattr(field, 'rel'):
-                model = field.rel.to
-                pk_attr_name = model._meta.pk.name
-            elif isinstance(field, RelatedObject):
-                model = field.model
-                pk_attr_name = model._meta.pk.name
-            else:
-                pk_attr_name = None
-        if pk_attr_name and len(parts) > 1 and parts[-1] == pk_attr_name:
-            parts.pop()
+        if len(parts) > 1:
+            # Special case -- foo__id__exact and foo__id queries are implied
+            # if foo has been specificially included in the lookup list; so
+            # drop __id if it is the last part. However, first we need to find
+            # the pk attribute name.
+            model = self.model
+            pk_attr_name = None
+            for part in parts[:-1]:
+                field, _, _, _ = model._meta.get_field_by_name(part)
+                if hasattr(field, 'rel'):
+                    model = field.rel.to
+                    pk_attr_name = model._meta.pk.name
+                elif isinstance(field, RelatedObject):
+                    model = field.model
+                    pk_attr_name = model._meta.pk.name
+                else:
+                    pk_attr_name = None
+            if pk_attr_name and parts[-1] == pk_attr_name:
+                parts.pop()
 
         try:
             self.model._meta.get_field_by_name(parts[0])
@@ -239 +240 @@
             # later.
             return True
         else:
+            if len(parts) == 1:
+                return True
             clean_lookup = LOOKUP_SEP.join(parts)
             return clean_lookup in self.list_filter or clean_lookup == self.date_hierarchy
 

tests/regressiontests/admin_views/tests.py

@@ -355 +355 @@
         )
 
         try:
-            self.client.get("/test_admin/admin/admin_views/stuff/?color__value__startswith=red")
+            self.client.get("/test_admin/admin/admin_views/thing/?color__value__startswith=red")
         except SuspiciousOperation:
             self.fail("Filters are allowed if explicitly included in list_filter")
 
+        try:
+            self.client.get("/test_admin/admin/admin_views/person/?alive__exact=1")
+        except SuspiciousOperation:
+            self.fail("Filters should be allowed if they involve a local field without the need to whitelist them in list_filter or date_hierarchy.")
+
 class SaveAsTests(TestCase):
     fixtures = ['admin-views-users.xml','admin-views-person.xml']