Changeset 8173

Timestamp:

08/01/08 13:55:43 (5 months ago)

Author:

brosner

Message:

Fixed #7885 -- Prevent duplicates in fields and fieldsets declarations. Thanks julien and wamberg for the patches.

Files:

• django/trunk/django/contrib/admin/validation.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/modeladmin/models.py (modified) (1 diff)

django/trunk/django/contrib/admin/validation.py

@@ +1 @@
+try:
+    set
+except NameError:
+    from sets import Set as set   # Python 2.3 fallback
-
-from django.core.exceptions import ImproperlyConfigured
@@ -166 +170 @@
-        if cls.fieldsets:
-            raise ImproperlyConfigured('Both fieldsets and fields are specified in %s.' % cls.__name__)
+        if len(cls.fields) > len(set(cls.fields)):
+            raise ImproperlyConfigured('There are duplicate field(s) in %s.fields' % cls.__name__)
-
-    # fieldsets
@@ -180 +186 @@
-                        "%s.fieldsets[%d][1] field options dict."
-                        % (cls.__name__, idx))
-
+
+
+
+
-            _check_form_field_existsw("fieldsets[%d][1]['fields']" % idx, field)
-

django/trunk/tests/regressiontests/modeladmin/models.py

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