From 795c229ae940b9bc543aacdf6dd0a30ffcc62b3c Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Mon, 19 Jan 2009 19:37:31 +0000 Subject: Fixed #10069 -- Fixed the model form unique validation code to not proceed with using, for example, RelatedObjects returned by get_field_by_name as though they were model Fields. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9777 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/models.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'django/forms') diff --git a/django/forms/models.py b/django/forms/models.py index 03ad10a4ea..01bd912063 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -224,7 +224,7 @@ class BaseModelForm(BaseForm): 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 @@ class BaseModelForm(BaseForm): 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,)) -- cgit v1.3