Changeset 7929 for django/branches/newforms-admin/django/core/management

Timestamp:

07/15/08 16:43:21 (6 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #5374 -- Added validation for ModelAdmin? and InlineModelAdmin? options including tests. Thanks mrts for initial legwork.

Files:

• django/branches/newforms-admin/django/core/management/validation.py (modified) (2 diffs)

django/branches/newforms-admin/django/core/management/validation.py

@@ -144 +144 @@
-                        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:
-            # prepopulated_fields
-            if not isinstance(opts.admin.prepopulated_fields, dict):
-                e.add(opts, '"%s": prepopulated_fields should be a dictionary.' % f.name)
-            else:
-                for field_name, field_list in opts.admin.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))
-
-            # list_display
-            if not isinstance(opts.admin.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:
-                    try:
-                        f = opts.get_field(fn)
-                    except models.FieldDoesNotExist:
-                        if not hasattr(cls, fn):
-                            e.add(opts, '"admin.list_display" refers to %r, which isn\'t an attribute, method or property.' % fn)
-                    else:
-                        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:
-                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)):
-                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:
-                    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:
-                        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)):
-                e.add(opts, '"admin.list_filter", if given, must be set to a list or tuple.')
-            else:
-                for fn in opts.admin.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:
-                try:
-                    f = opts.get_field(opts.admin.date_hierarchy)
-                except models.FieldDoesNotExist:
-                    e.add(opts, '"admin.date_hierarchy" refers to %r, which isn\'t a field.' % opts.admin.date_hierarchy)
-
-        # Check ordering attribute.
-        if opts.ordering:
@@ -214 +161 @@
-                    e.add(opts, '"ordering" refers to "%s", a field that doesn\'t exist.' % field_name)
-
-        # Check core=True, if needed.
-        for related in opts.get_followed_related_objects():
-            if not related.edit_inline:
-                continue
-            try:
-                for f in related.opts.fields:
-                    if f.core:
-                        raise StopIteration
-                e.add(related.opts, "At least one field in %s should have core=True, because it's being edited inline by %s.%s." % (related.opts.object_name, opts.module_name, opts.object_name))
-            except StopIteration:
-                pass
-
-        # Check unique_together.
-        for ut in opts.unique_together: