Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #8795: unique_together validation no longer fails on model form…

…s that exclude fields included in the check. Thanks, Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 98e1cc92f47cbda977a923b9ba8d980bc01cd749 1 parent 5c32fe7
@jacobian jacobian authored
Showing with 20 additions and 2 deletions.
  1. +12 −2 django/forms/models.py
  2. +8 −0 tests/modeltests/model_forms/models.py
View
14 django/forms/models.py
@@ -210,10 +210,20 @@ def clean(self):
def validate_unique(self):
from django.db.models.fields import FieldDoesNotExist
- unique_checks = list(self.instance._meta.unique_together[:])
+
+ # Gather a list of checks to perform. Since this is a ModelForm, some
+ # fields may have been excluded; we can't perform a unique check on a
+ # form that is missing fields involved in that check.
+ unique_checks = []
+ for check in self.instance._meta.unique_together[:]:
+ fields_on_form = [field for field in check if field in self.fields]
+ if len(fields_on_form) == len(check):
+ unique_checks.append(check)
+
form_errors = []
- # Make sure the unique checks apply to actual fields on the ModelForm
+ # Gather a list of checks for fields declared as unique and add them to
+ # the list of checks. Again, skip fields not on the form.
for name, field in self.fields.items():
try:
f = self.instance._meta.get_field_by_name(name)[0]
View
8 tests/modeltests/model_forms/models.py
@@ -1192,6 +1192,14 @@ def __unicode__(self):
>>> form._errors
{'__all__': [u'Price with this Price and Quantity already exists.']}
+>>> class PriceForm(ModelForm):
+... class Meta:
+... model = Price
+... exclude = ('quantity',)
+>>> form = PriceForm({'price': '6.00'})
+>>> form.is_valid()
+True
+
# Choices on CharField and IntegerField
>>> class ArticleForm(ModelForm):
... class Meta:
Please sign in to comment.
Something went wrong with that request. Please try again.