Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #10069 -- Fixed the model form unique validation code t…

…o not proceed with using, for example, RelatedObjects returned by get_field_by_name as though they were model Fields.

r9777 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 709476ae0574ee19d35640c03770377cfca6d91d 1 parent 3e19109
@kmtracey kmtracey authored
Showing with 18 additions and 1 deletion.
  1. +7 −1 django/forms/models.py
  2. +11 −0 tests/modeltests/model_forms/models.py
View
8 django/forms/models.py
@@ -224,7 +224,7 @@ def clean(self):
return self.cleaned_data
def validate_unique(self):
- from django.db.models.fields import FieldDoesNotExist
+ from django.db.models.fields import FieldDoesNotExist, Field as ModelField
# Gather a list of checks to perform. We only perform unique checks
# for fields present and not None in cleaned_data. Since this is a
@@ -248,6 +248,12 @@ def validate_unique(self):
except FieldDoesNotExist:
# This is an extra field that's not on the ModelForm, ignore it
continue
+ if not isinstance(f, ModelField):
+ # This is an extra field that happens to have a name that matches,
+ # for example, a related object accessor for this model. So
+ # get_field_by_name found it, but it is not a Field so do not proceed
+ # to use it as if it were.
+ continue
if f.unique and self.cleaned_data.get(name) is not None:
unique_checks.append((name,))
View
11 tests/modeltests/model_forms/models.py
@@ -193,6 +193,17 @@ def __unicode__(self):
>>> CategoryForm.base_fields.keys()
['name', 'slug', 'url', 'some_extra_field']
+Extra field that has a name collision with a related object accessor.
+
+>>> class WriterForm(ModelForm):
+... book = forms.CharField(required=False)
+...
+... class Meta:
+... model = Writer
+
+>>> wf = WriterForm({'name': 'Richard Lockridge'})
+>>> wf.is_valid()
+True
Replacing a field.
Please sign in to comment.
Something went wrong with that request. Please try again.