From 552abffab16cbdff571486b683e7e7ef12e46066 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 31 Jan 2018 13:43:05 -0500
Subject: [PATCH] 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.
---
 django/contrib/admin/widgets.py | 3 ++-
 docs/releases/1.11.10.txt       | 3 +++
 docs/releases/2.0.2.txt         | 3 +++
 tests/admin_widgets/models.py   | 3 +++
 tests/admin_widgets/tests.py    | 8 +++++++-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 40afe0773f..91795d4ce4 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -6,6 +6,7 @@ import json
 
 from django import forms
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.db.models.deletion import CASCADE
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
@@ -183,7 +184,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/docs/releases/2.0.2.txt b/docs/releases/2.0.2.txt
index c6633491d2..562f30995f 100644
--- a/docs/releases/2.0.2.txt
+++ b/docs/releases/2.0.2.txt
@@ -27,3 +27,6 @@ Bugfixes
 
 * Fixed a regression where ``makemigrations`` crashes if a migrations directory
   doesn't have an ``__init__.py`` file (:ticket:`29091`).
+
+* 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 bd00b114d3..5fc9f13e96 100644
--- a/tests/admin_widgets/models.py
+++ b/tests/admin_widgets/models.py
@@ -1,3 +1,5 @@
+import uuid
+
 from django.contrib.auth.models import User
 from django.db import models
 
@@ -92,6 +94,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 c0a9e1e844..43cf9f4182 100644
--- a/tests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -14,7 +14,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 translation
@@ -248,6 +248,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):