Ticket #4009: admin_list_filter.diff

core/management.py

@@ -927 +927 @@
     from django.db import models, connection
     from django.db.models.loading import get_app_errors
     from django.db.models.fields.related import RelatedObject
+    from django.db.models.query import LOOKUP_SEPARATOR
 
     e = ModelErrorCollection(outfile)
 
@@ -1077 +1078 @@
                     e.add(opts, '"admin.list_filter", if given, must be set to a list or tuple.')
                 else:
                     for fn in opts.admin.list_filter:
+                        # Break the entry up using the lookup separator, and
+                        # make sure each one points to a valid field.
+                        field_lookups = fn.split(LOOKUP_SEPARATOR)
                         try:
-                            f = opts.get_field(fn)
+                            f = opts.get_field(field_lookups[0])
+                            if len(field_lookups) > 1:
+                                if not f.rel:
+                                    e.add(opts, '"admin.list_filter" refers to %r, which contains a non-related field.' % fn)
+                                for field_name in field_lookups[1:]:
+                                    model = f.rel.to
+                                    f = model._meta.get_field(field_name)
+                                    if not f.rel:
+                                        e.add(opts, '"admin.list_filter" refers to %r, which contains a non-related field.' % fn)
                         except models.FieldDoesNotExist:
-                            e.add(opts, '"admin.list_filter" refers to %r, which isn\'t a field.' % fn)
+                            if not hasattr(cls, field_lookups[0]):
+                                e.add(opts, '"admin.list_filter" refers to %r, which isn\'t a field.' % fn)
                 # date_hierarchy
                 if opts.admin.date_hierarchy:
                     try: