Changeset 7943

Timestamp:

07/17/08 11:48:27 (4 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #7790 -- Check form fields, not model fields when testing for field existence in fields and fieldsets. Thanks Rozza for catching this and writing an initial patch.

Files:

• django/branches/newforms-admin/django/contrib/admin/validation.py (modified) (5 diffs)
• django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py (modified) (3 diffs)

django/branches/newforms-admin/django/contrib/admin/validation.py

@@ -2 +2 @@
-from django.core.exceptions import ImproperlyConfigured
-from django.db import models
-
+, fields_for_model
-from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
-from django.contrib.admin.options import HORIZONTAL, VERTICAL
@@ -145 +145 @@
-    def _check_field_existsw(label, field):
-        return _check_field_exists(cls, model, opts, label, field)
+    
+    def _check_form_field_existsw(label, field):
+        return _check_form_field_exists(cls, model, opts, label, field)
-
-    # raw_id_fields
@@ -160 +163 @@
-        _check_istuplew('fields', cls.fields)
-        for field in cls.fields:
-
+orm_f
-        if cls.fieldsets:
-            raise ImproperlyConfigured('Both fieldsets and fields are specified in %s.' % cls.__name__)
@@ -178 +181 @@
-                        % (cls.__name__, idx))
-        for field in flatten_fieldsets(cls.fieldsets):
-
+orm_f
-
-    # form
@@ -251 +254 @@
-                % (cls.__name__, label, field, model.__name__))
-
+def _check_form_field_exists(cls, model, opts, label, field):
+    if hasattr(cls.form, 'base_fields'):
+        try:
+            cls.form.base_fields[field]
+        except KeyError:
+            raise ImproperlyConfigured("`%s.%s` refers to field `%s` that "
+                "is missing from the form." % (cls.__name__, label, field))
+    else:
+        fields = fields_for_model(model)
+        try:
+            fields[field]
+        except KeyError:
+            raise ImproperlyConfigured("`%s.%s` refers to field `%s` that "
+                "is missing from the form." % (cls.__name__, label, field))
+
-def _check_attr_exists(cls, model, opts, label, field):
-    try:

django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py

@@ -333 +333 @@
-Traceback (most recent call last):
-...
-model `ValidationTestModel`
+the form
-
->>> class ValidationTestModelAdmin(ModelAdmin):
@@ -358 +358 @@
-ImproperlyConfigured: ValidationTestModelAdmin.form does not inherit from BaseModelForm.
-
+# fielsets with custom form
+
+>>> class BandAdmin(ModelAdmin):
+...     fieldsets = (
+...         ('Band', {
+...             'fields': ('non_existent_field',)
+...         }),
+...     )
+>>> validate(BandAdmin, Band)
+Traceback (most recent call last):
+...
+ImproperlyConfigured: `BandAdmin.fieldsets[0][1]['fields']` refers to field `non_existent_field` that is missing from the form.
+
+>>> class BandAdmin(ModelAdmin):
+...     fieldsets = (
+...         ('Band', {
+...             'fields': ('name',)
+...         }),
+...     )
+>>> validate(BandAdmin, Band)
+
+>>> class AdminBandForm(forms.ModelForm):
+...     class Meta:
+...         model = Band
+>>> class BandAdmin(ModelAdmin):
+...     form = AdminBandForm
+...
+...     fieldsets = (
+...         ('Band', {
+...             'fields': ('non_existent_field',)
+...         }),
+...     )
+>>> validate(BandAdmin, Band)
+Traceback (most recent call last):
+...
+ImproperlyConfigured: `BandAdmin.fieldsets[0][1]['fields']` refers to field `non_existent_field` that is missing from the form.
+
+>>> class AdminBandForm(forms.ModelForm):
+...     delete = forms.BooleanField()
+...
+...     class Meta:
+...         model = Band
+>>> class BandAdmin(ModelAdmin):
+...     form = AdminBandForm
+...
+...     fieldsets = (
+...         ('Band', {
+...             'fields': ('name', 'bio', 'sign_date', 'delete')
+...         }),
+...     )
+>>> validate(BandAdmin, Band)
+
-# filter_vertical
-
@@ -737 +789 @@
-Traceback (most recent call last):
-...
-model `ValidationTestInlineModel`
+the form
-
-# fk_name