summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2010-09-11 18:34:40 +0000
committerJustin Bronn <jbronn@gmail.com>2010-09-11 18:34:40 +0000
commit9e04c3b7444ba136efa03896a67e46d2e7045e28 (patch)
treed8a99ae8f007f8cc4e337cb725b341459c4f760a /django/forms
parentfffe0a00a383f46fdfb8de44d56f8ae2e2ee09de (diff)
Fixed #13149 -- The admin `ForeignKeyRawIdWidget` now properly handles non-integer values. Thanks, Chris Adams.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py
index 607ac455fe..cf465ad30c 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -1006,7 +1006,7 @@ class ModelChoiceField(ChoiceField):
try:
key = self.to_field_name or 'pk'
value = self.queryset.get(**{key: value})
- except self.queryset.model.DoesNotExist:
+ except (ValueError, self.queryset.model.DoesNotExist):
raise ValidationError(self.error_messages['invalid_choice'])
return value