Ticket #5374: modelamin.patch

django/core/management/validation.py

@@ -1 +1 @@
 import sys
 from django.core.management.color import color_style
+from django.contrib import admin
 
 class ModelErrorCollection:
     def __init__(self, outfile=sys.stdout):
@@ -132 +133 @@
                         e.add(opts, "Reverse query name for m2m field '%s' clashes with related field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))
 
         # Check admin attribute.
-        if opts.admin is not None:
+        if cls in admin.site._registry:
+            admin_opts = admin.site._registry[cls]
             # prepopulated_fields
-            if not isinstance(opts.admin.prepopulated_fields, dict):
-                e.add(opts, '"%s": prepopulated_fields should be a dictionary.' % f.name)
+            if not isinstance(admin_opts.prepopulated_fields, dict):
+                e.add(opts, 'admin: prepopulated_fields should be a dictionary.')
             else:
-                for field_name, field_list in opts.admin.prepopulated_fields.items():
+                for field_name, field_list in admin_opts.prepopulated_fields.items():
                     if not isinstance(field_list, (list, tuple)):
-                        e.add(opts, '"%s": prepopulated_fields "%s" value should be a list or tuple.' % (f.name, field_name))
+                        e.add(opts, 'admin: prepopulated_fields "%s" value should be a list or tuple.' % (field_name))
 
             # list_display
-            if not isinstance(opts.admin.list_display, (list, tuple)):
+            if not isinstance(admin_opts.list_display, (list, tuple)):
                 e.add(opts, '"admin.list_display", if given, must be set to a list or tuple.')
             else:
-                for fn in opts.admin.list_display:
+                for fn in admin_opts.list_display:
                     try:
                         f = opts.get_field(fn)
                     except models.FieldDoesNotExist:
@@ -155 +157 @@
                         if isinstance(f, models.ManyToManyField):
                             e.add(opts, '"admin.list_display" doesn\'t support ManyToManyFields (%r).' % fn)
             # list_display_links
-            if opts.admin.list_display_links and not opts.admin.list_display:
+            if admin_opts.list_display_links and not admin_opts.list_display:
                 e.add(opts, '"admin.list_display" must be defined for "admin.list_display_links" to be used.')
-            if not isinstance(opts.admin.list_display_links, (list, tuple)):
+            if not isinstance(admin_opts.list_display_links, (list, tuple)):
                 e.add(opts, '"admin.list_display_links", if given, must be set to a list or tuple.')
             else:
-                for fn in opts.admin.list_display_links:
+                for fn in admin_opts.list_display_links:
                     try:
                         f = opts.get_field(fn)
                     except models.FieldDoesNotExist:
                         if not hasattr(cls, fn):
                             e.add(opts, '"admin.list_display_links" refers to %r, which isn\'t an attribute, method or property.' % fn)
-                    if fn not in opts.admin.list_display:
+                    if fn not in admin_opts.list_display:
                         e.add(opts, '"admin.list_display_links" refers to %r, which is not defined in "admin.list_display".' % fn)
             # list_filter
-            if not isinstance(opts.admin.list_filter, (list, tuple)):
+            if not isinstance(admin_opts.list_filter, (list, tuple)):
                 e.add(opts, '"admin.list_filter", if given, must be set to a list or tuple.')
             else:
-                for fn in opts.admin.list_filter:
+                for fn in admin_opts.list_filter:
                     try:
                         f = opts.get_field(fn)
                     except models.FieldDoesNotExist:
                         e.add(opts, '"admin.list_filter" refers to %r, which isn\'t a field.' % fn)
             # date_hierarchy
-            if opts.admin.date_hierarchy:
+            if admin_opts.date_hierarchy:
                 try:
-                    f = opts.get_field(opts.admin.date_hierarchy)
+                    f = opts.get_field(admin_opts.date_hierarchy)
                 except models.FieldDoesNotExist:
-                    e.add(opts, '"admin.date_hierarchy" refers to %r, which isn\'t a field.' % opts.admin.date_hierarchy)
+                    e.add(opts, '"admin.date_hierarchy" refers to %r, which isn\'t a field.' % admin_opts.date_hierarchy)
+            # raw_id_admin
+            if not isinstance(admin_opts.raw_id_fields, (list, tuple)):
+                e.add(opts, '"admin.raw_id_fields", if given, must be set to a list or tuple.')
+            else:
+                for fn in admin_opts.raw_id_fields:
+                    try:
+                        f = opts.get_field(fn)
+                    except models.FieldDoesNotExist:
+                        e.add(opts, '"admin.raw_id_fields" refers to %r, which isn\'t a field.' % fn)
 
+
         # Check ordering attribute.
         if opts.ordering:
             for field_name in opts.ordering: