mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #12881: Corrected handling of inherited unique constraints. Thanks for report fgaudin.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey
2010-03-16 19:32:11 +00:00
parent 883329ecb3
commit 47a822207f
6 changed files with 245 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
django/forms/models.py
View File

@@ -488,7 +488,7 @@ class BaseModelFormSet(BaseFormSet):
errors = []
# Do each of the unique checks (unique and unique_together)
for unique_check in all_unique_checks:
for uclass, unique_check in all_unique_checks:
seen_data = set()
for form in self.forms:
# if the form doesn't have cleaned_data then we ignore it,
@@ -512,7 +512,7 @@ class BaseModelFormSet(BaseFormSet):
# iterate over each of the date checks now
for date_check in all_date_checks:
seen_data = set()
lookup, field, unique_for = date_check
uclass, lookup, field, unique_for = date_check
for form in self.forms:
# if the form doesn't have cleaned_data then we ignore it,
# it's already invalid
@@ -556,9 +556,9 @@ class BaseModelFormSet(BaseFormSet):
def get_date_error_message(self, date_check):
return ugettext("Please correct the duplicate data for %(field_name)s "
"which must be unique for the %(lookup)s in %(date_field)s.") % {
'field_name': date_check[1],
'date_field': date_check[2],
'lookup': unicode(date_check[0]),
'field_name': date_check[2],
'date_field': date_check[3],
'lookup': unicode(date_check[1]),
}
def get_form_error(self):