Ticket #12901: 12901-against-12454.diff

django/forms/models.py

@@ -276 +276 @@
             # adding these values to the model after form validation.
             if field not in self.fields:
                 exclude.append(f.name)
+
+            # if some fields were excluded, don't run their validation
+            # this is needed on top of previous line to catch fields added onto
+            # the form with same name as some model field
+            elif self._meta.fields and field not in self._meta.fields:
+                exclude.append(f.name)
             # Exclude fields that failed form validation. There's no need for
             # the model fields to validate them as well.
             elif field in self._errors.keys():

tests/modeltests/model_forms/models.py

@@ -9 +9 @@
 
 import os
 import tempfile
+from unittest import TestCase
 
 from django.db import models
 from django.core.files.storage import FileSystemStorage
+from django import forms
+from django.forms.models import ModelForm
 
 temp_storage_dir = tempfile.mkdtemp()
 temp_storage = FileSystemStorage(temp_storage_dir)
@@ -205 +208 @@
     def __unicode__(self):
         return unicode(self.biggie)
 
+class IncompleteCategoryForm(ModelForm):
+    url = forms.CharField(required=False)
+
+    class Meta:
+        fields = ('name', 'slug')
+        model = Category
+
+class TestCase(TestCase):
+    def test_category_doesnt_validate_url_when_not_on_modelform(self):
+        form = IncompleteCategoryForm(data={'name': 'some name', 'slug': 'some-slug'})
+        assert form.is_valid()
+
 __test__ = {'API_TESTS': """
 >>> from django import forms
 >>> from django.forms.models import ModelForm, model_to_dict