Changeset 7932

Timestamp:

07/15/08 21:01:18 (4 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #7772 -- Moved the validation check for when both fields and fieldsets are specified on a ModelAdmin? to django/contrib/admin/validation.py. Thanks Julien Phalip for catching this.

Files:

• django/branches/newforms-admin/AUTHORS (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/validation.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py (modified) (1 diff)

django/branches/newforms-admin/AUTHORS

@@ -298 +298 @@
-    pgross@thoughtworks.com
-    phaedo <http://phaedo.cx/>
+    Julien Phalip <http://www.julienphalip.com>
-    phil@produxion.net
-    phil.h.smith@gmail.com

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

@@ -143 +143 @@
-    radio_fields = {}
-    prepopulated_fields = {}
-
-    def __init__(self):
-        # TODO: This should really go in django.core.validation, but validation
-        # doesn't work on ModelAdmin classes yet.
-        if self.fieldsets and self.fields:
-            raise ImproperlyConfigured('Both fieldsets and fields is specified for %s.' % self.model)
-
-    def formfield_for_dbfield(self, db_field, **kwargs):

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

@@ -161 +161 @@
-        for field in cls.fields:
-            _check_field_existsw('fields', field)
+        if cls.fieldsets:
+            raise ImproperlyConfigured('Both fieldsets and fields are specified in %s.' % cls.__name__)
-
-    # fieldsets

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

@@ -339 +339 @@
->>> validate(ValidationTestModelAdmin, ValidationTestModel)
-
+>>> class ValidationTestModelAdmin(ModelAdmin):
+...     fieldsets = (("General", {"fields": ("name",)}),)
+...     fields = ["name",]
+>>> validate(ValidationTestModelAdmin, ValidationTestModel)
+Traceback (most recent call last):
+...
+ImproperlyConfigured: Both fieldsets and fields are specified in ValidationTestModelAdmin.
+
-# form
-