summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Haag <jonas@lophus.org>2018-01-03 18:04:57 +0100
committerTim Graham <timograham@gmail.com>2018-01-03 15:02:06 -0500
commit602481d0c9edb79692955e073fa481c322f1df47 (patch)
treea679c6cfba96cfec3abdcd2abf83752cc7c8c9fc
parentea10efebfaa15fd7a9dcdd01c6d044ded0a8306a (diff)
Fixed #28986 -- Prevented boolean values in admin list display from being formatted with thousand separators.
-rw-r--r--django/contrib/admin/utils.py2
-rw-r--r--tests/admin_utils/tests.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py
index 849a695276..a2518a78a1 100644
--- a/django/contrib/admin/utils.py
+++ b/django/contrib/admin/utils.py
@@ -418,6 +418,8 @@ def display_for_value(value, empty_value_display, boolean=False):
return _boolean_icon(value)
elif value is None:
return empty_value_display
+ elif isinstance(value, bool):
+ return str(value)
elif isinstance(value, datetime.datetime):
return formats.localize(timezone.template_localtime(value))
elif isinstance(value, (datetime.date, datetime.time)):
diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py
index 212254f4fd..aae8b74ae2 100644
--- a/tests/admin_utils/tests.py
+++ b/tests/admin_utils/tests.py
@@ -210,6 +210,8 @@ class UtilsTests(SimpleTestCase):
display_for_value(False, '', boolean=True),
'<img src="/static/admin/img/icon-no.svg" alt="False" />'
)
+ self.assertEqual(display_for_value(True, ''), 'True')
+ self.assertEqual(display_for_value(False, ''), 'False')
def test_label_for_field(self):
"""