Ticket #7772: fields_and_fields.diff

django/django/contrib/admin/validation.py

@@ -154 +154 @@
         _check_istuplew('fields', cls.fields)
         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
     if cls.fieldsets: # default value is None

django/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):
         """
         Hook for specifying the form Field instance for a given database Field

django/tests/regressiontests/modeladmin/models.py

@@ -337 +337 @@
 ...     fieldsets = (("General", {"fields": ("name",)}),)
 >>> 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
 
 >>> class FakeForm(object):