Ticket #13971: 13971_patch.diff

django/forms/models.py

@@ -196 +196 @@
         )
     return field_dict
 
+def filter_declared_fields(model, declared_fields, fields=None, exclude=None):
+    """
+    Returns an updated ``SortedDict`` filtering out the model fields
+    not included or excluded in the form definition.
+
+    """
+    opts = model._meta
+    for f in opts.fields + opts.many_to_many:
+        exclude_field = (fields is not None and not f.name in fields) or \
+                        (exclude is not None and f.name in exclude)
+        if exclude_field and f.name in declared_fields:
+            del declared_fields[f.name]
+    return declared_fields
+
+
 class ModelFormOptions(object):
     def __init__(self, options=None):
         self.model = getattr(options, 'model', None)
@@ -234 +249 @@
                 message = message % (', '.join(missing_fields),
                                      opts.model.__name__)
                 raise FieldError(message)
+            # Filter out excluded fields from declared fields
+            declared_fields = filter_declared_fields(opts.model,
+                                                     declared_fields,
+                                                     opts.fields, opts.exclude)
             # Override default model fields with any custom declared ones
             # (plus, include all the other declared fields).
             fields.update(declared_fields)

tests/regressiontests/model_forms_regress/tests.py

@@ -442 +442 @@
         self.assertTrue(form.is_valid())
         instance = construct_instance(form, Person(), fields=())
         self.assertEqual(instance.name, '')
+
+
+class BasePublicationForm(forms.ModelForm):
+    date_published = forms.CharField()
+    class Meta:
+        model = Publication
+
+class PublicationFormWithFields(BasePublicationForm):
+    class Meta(BasePublicationForm.Meta):
+        fields = ('title',)
+
+class PublicationFormWithExclude(BasePublicationForm):
+    class Meta(BasePublicationForm.Meta):
+        exclude = ('date_published',)
+        
+class ExcludeCustomizedField(TestCase):
+    """Test excluded form customized model field is not added to form (#13971)."""
+    
+    def test_field_is_not_added(self):
+        form = PublicationFormWithFields()
+        self.assert_('title' in form.fields)
+        self.assert_('date_published' not in form.fields)
+        self.assertEqual(len(form.fields), 1)
+ 
+    def test_field_is_excluded(self):
+        form = PublicationFormWithExclude()
+        self.assert_('title' in form.fields)
+        self.assert_('date_published' not in form.fields)
+        self.assertEqual(len(form.fields), 1)
+