From 9b02ad91ead3db75036be981bab2083aebc993a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Lazarevi=C4=87?= Date: Mon, 8 Jan 2024 15:47:09 +0700 Subject: [PATCH] Fixed #28404 -- Made displaying values in admin respect Field's empty_values. --- AUTHORS | 1 + django/contrib/admin/utils.py | 2 +- tests/admin_changelist/tests.py | 34 +++++++++++++++++++++++++++------ tests/admin_utils/tests.py | 9 ++++++--- tests/admin_widgets/tests.py | 2 +- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/AUTHORS b/AUTHORS index f63f712f3a..8319353cf5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -47,6 +47,7 @@ answer newbie questions, and generally made Django that much better: Aleksandra Sendecka Aleksi Häkli Alex Dutton + Alexander Lazarević Alexander Myodov Alexandr Tatarinov Alex Aktsipetrov diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index d6c54dd440..97a09143ad 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -433,7 +433,7 @@ def display_for_field(value, field, empty_value_display): # general null test. elif isinstance(field, models.BooleanField): return _boolean_icon(value) - elif value is None: + elif value in field.empty_values: return empty_value_display elif isinstance(field, models.DateTimeField): return formats.localize(timezone.template_localtime(value)) diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 4870d9bbe9..b4739b572d 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -74,15 +74,15 @@ from .models import ( ) -def build_tbody_html(obj, href, extra_fields): +def build_tbody_html(obj, href, field_name, extra_fields): return ( "" '' '' - 'name' + '{}' "{}" - ).format(obj.pk, str(obj), href, extra_fields) + ).format(obj.pk, str(obj), href, field_name, extra_fields) @override_settings(ROOT_URLCONF="admin_changelist.urls") @@ -245,7 +245,7 @@ class ChangeListTests(TestCase): table_output = template.render(context) link = reverse("admin:admin_changelist_child_change", args=(new_child.id,)) row_html = build_tbody_html( - new_child, link, '-' + new_child, link, "name", '-' ) self.assertNotEqual( table_output.find(row_html), @@ -253,6 +253,24 @@ class ChangeListTests(TestCase): "Failed to find expected row element: %s" % table_output, ) + def test_result_list_empty_changelist_value_blank_string(self): + new_child = Child.objects.create(name="", parent=None) + request = self.factory.get("/child/") + request.user = self.superuser + m = ChildAdmin(Child, custom_site) + cl = m.get_changelist_instance(request) + cl.formset = None + template = Template( + "{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}" + ) + context = Context({"cl": cl, "opts": Child._meta}) + table_output = template.render(context) + link = reverse("admin:admin_changelist_child_change", args=(new_child.id,)) + row_html = build_tbody_html( + new_child, link, "-", '-' + ) + self.assertInHTML(row_html, table_output) + def test_result_list_set_empty_value_display_on_admin_site(self): """ Empty value display can be set on AdminSite. @@ -272,7 +290,7 @@ class ChangeListTests(TestCase): table_output = template.render(context) link = reverse("admin:admin_changelist_child_change", args=(new_child.id,)) row_html = build_tbody_html( - new_child, link, '???' + new_child, link, "name", '???' ) self.assertNotEqual( table_output.find(row_html), @@ -299,6 +317,7 @@ class ChangeListTests(TestCase): row_html = build_tbody_html( new_child, link, + "name", '†' '-empty-', ) @@ -327,7 +346,10 @@ class ChangeListTests(TestCase): table_output = template.render(context) link = reverse("admin:admin_changelist_child_change", args=(new_child.id,)) row_html = build_tbody_html( - new_child, link, '%s' % new_parent + new_child, + link, + "name", + '%s' % new_parent, ) self.assertNotEqual( table_output.find(row_html), diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py index 582ed23b4d..393770bd2d 100644 --- a/tests/admin_utils/tests.py +++ b/tests/admin_utils/tests.py @@ -159,9 +159,12 @@ class UtilsTests(SimpleTestCase): models.TimeField(), ] for model_field in tests: - with self.subTest(model_field=model_field): - display_value = display_for_field(None, model_field, self.empty_value) - self.assertEqual(display_value, self.empty_value) + for value in model_field.empty_values: + with self.subTest(model_field=model_field, empty_value=value): + display_value = display_for_field( + value, model_field, self.empty_value + ) + self.assertEqual(display_value, self.empty_value) def test_empty_value_display_choices(self): model_field = models.CharField(choices=((None, "test_none"),)) diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index d497599435..50c26095ff 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -641,7 +641,7 @@ class AdminFileWidgetTests(TestDataMixin, TestCase): response = self.client.get(reverse("admin:admin_widgets_album_add")) self.assertContains( response, - '
', + '
-
', html=True, )