Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #12901. Again. Model validation will not be performed on exclud…

…ed fields that were overridden in the form. Thanks, ammarr.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e488c1dc0d29f2de0d8bb31db604aa6384b7a60b 1 parent c736cbe
Joseph Kocherhans jkocherhans authored
Showing with 21 additions and 3 deletions.
  1. +2 −0  django/forms/models.py
  2. +19 −3 tests/modeltests/model_forms/tests.py
2  django/forms/models.py
View
@@ -280,6 +280,8 @@ def _get_validation_exclusions(self):
# class. See #12901.
elif self._meta.fields and field not in self._meta.fields:
exclude.append(f.name)
+ elif self._meta.exclude and field in self._meta.exclude:
+ exclude.append(f.name)
# Exclude fields that failed form validation. There's no need for
# the model fields to validate them as well.
22 tests/modeltests/model_forms/tests.py
View
@@ -3,7 +3,7 @@
from models import Category
-class IncompleteCategoryForm(forms.ModelForm):
+class IncompleteCategoryFormWithFields(forms.ModelForm):
"""
A form that replaces the model's url field with a custom one. This should
prevent the model field's validation from being called.
@@ -14,8 +14,24 @@ class Meta:
fields = ('name', 'slug')
model = Category
+class IncompleteCategoryFormWithExclude(forms.ModelForm):
+ """
+ A form that replaces the model's url field with a custom one. This should
+ prevent the model field's validation from being called.
+ """
+ url = forms.CharField(required=False)
+
+ class Meta:
+ exclude = ['url']
+ model = Category
+
+
class ValidationTest(TestCase):
- def test_validates_with_replaced_field(self):
- form = IncompleteCategoryForm(data={'name': 'some name', 'slug': 'some-slug'})
+ def test_validates_with_replaced_field_not_specified(self):
+ form = IncompleteCategoryFormWithFields(data={'name': 'some name', 'slug': 'some-slug'})
+ assert form.is_valid()
+
+ def test_validates_with_replaced_field_excluded(self):
+ form = IncompleteCategoryFormWithExclude(data={'name': 'some name', 'slug': 'some-slug'})
assert form.is_valid()
Please sign in to comment.
Something went wrong with that request. Please try again.