From 897f38fabea5e1b196f11250ff6dadfffa489840 Mon Sep 17 00:00:00 2001 From: David Wobrock Date: Mon, 22 Aug 2022 23:30:14 +0200 Subject: Fixed #33927 -- Fixed crash when displaying ArrayField with choices in admin. --- django/contrib/admin/utils.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 6cb549fb10..b971bd528f 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -10,6 +10,7 @@ from django.db.models.deletion import Collector from django.forms.utils import pretty_name from django.urls import NoReverseMatch, reverse from django.utils import formats, timezone +from django.utils.hashable import make_hashable from django.utils.html import format_html from django.utils.regex_helper import _lazy_re_compile from django.utils.text import capfirst @@ -401,7 +402,14 @@ def display_for_field(value, field, empty_value_display): from django.contrib.admin.templatetags.admin_list import _boolean_icon if getattr(field, "flatchoices", None): - return dict(field.flatchoices).get(value, empty_value_display) + try: + return dict(field.flatchoices).get(value, empty_value_display) + except TypeError: + # Allow list-like choices. + flatchoices = make_hashable(field.flatchoices) + value = make_hashable(value) + return dict(flatchoices).get(value, empty_value_display) + # BooleanField needs special-case null-handling, so it comes before the # general null test. elif isinstance(field, models.BooleanField): -- cgit v1.3