summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-01-31 13:43:05 -0500
committerTim Graham <timograham@gmail.com>2018-02-01 08:56:52 -0500
commit1c9233b1b9f903e4e2cb20a724e8c22aee4aacb2 (patch)
treef059dc4100e46c9d29ccee0647cca59edc82faa0 /django
parenta0c2e3fde75f984ab2ead30e7004cc7ab38e30a8 (diff)
[1.11.x] Fixed #29094 -- Fixed crash when entering an invalid uuid in ModelAdmin.raw_id_fields.
Regression in 2f9861d823620da7ecb291a8f005f53da12b1e89. Thanks Carel Burger for the report and fix. Backport of docs552abffab16cbdff571486b683e7e7ef12e46066 from master
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/widgets.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 669c715123..89e8adde30 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
import copy
from django import forms
+from django.core.exceptions import ValidationError
from django.db.models.deletion import CASCADE
from django.urls import reverse
from django.urls.exceptions import NoReverseMatch
@@ -174,7 +175,7 @@ class ForeignKeyRawIdWidget(forms.TextInput):
key = self.rel.get_related_field().name
try:
obj = self.rel.model._default_manager.using(self.db).get(**{key: value})
- except (ValueError, self.rel.model.DoesNotExist):
+ except (ValueError, self.rel.model.DoesNotExist, ValidationError):
return '', ''
try: