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: diff --git a/docs/releases/1.11.10.txt b/docs/releases/1.11.10.txt index 88d2d007bf..cfa8fc2070 100644 --- a/docs/releases/1.11.10.txt +++ b/docs/releases/1.11.10.txt @@ -15,3 +15,6 @@ Bugfixes * Fixed a regression where ``contrib.auth.authenticate()`` crashes if an authentication backend doesn't accept ``request`` and a later one does (:ticket:`29071`). + +* Fixed crash when entering an invalid uuid in ``ModelAdmin.raw_id_fields`` + (:ticket:`29094`). diff --git a/tests/admin_widgets/models.py b/tests/admin_widgets/models.py index 274c36e15e..4c6c10000a 100644 --- a/tests/admin_widgets/models.py +++ b/tests/admin_widgets/models.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +import uuid + from django.contrib.auth.models import User from django.db import models from django.utils.encoding import python_2_unicode_compatible @@ -99,6 +101,7 @@ class CarTire(models.Model): class Honeycomb(models.Model): + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) location = models.CharField(max_length=20) diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 2e2bdb0b52..4d78d5fd5b 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -17,7 +17,7 @@ from django.contrib.admin.tests import AdminSeleniumTestCase from django.contrib.auth.models import User from django.core.files.storage import default_storage from django.core.files.uploadedfile import SimpleUploadedFile -from django.db.models import CharField, DateField, DateTimeField +from django.db.models import CharField, DateField, DateTimeField, UUIDField from django.test import SimpleTestCase, TestCase, override_settings from django.urls import reverse from django.utils import six, translation @@ -251,6 +251,12 @@ class AdminForeignKeyRawIdWidget(TestDataMixin, TestCase): lookup2 = widgets.url_params_from_lookup_dict({'myfield': my_callable()}) self.assertEqual(lookup1, lookup2) + def test_label_and_url_for_value_invalid_uuid(self): + field = Bee._meta.get_field('honeycomb') + self.assertIsInstance(field.target_field, UUIDField) + widget = widgets.ForeignKeyRawIdWidget(field.remote_field, admin.site) + self.assertEqual(widget.label_and_url_for_value('invalid-uuid'), ('', '')) + class FilteredSelectMultipleWidgetTest(SimpleTestCase): def test_render(self):