test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #33524 -- Allowed overriding empty_label for ForeignKey in ModelAdmin.radio_fields.

This commit is contained in:
Hrushikesh Vaidya 2022-02-27 08:26:16 +05:30 committed by Mariusz Felisiak
parent e0442a628e
commit 119f227aa6
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/options.py
View File

@ -269,7 +269,9 @@ class BaseModelAdmin(metaclass=forms.MediaDefiningClass):
"class": get_ul_class(self.radio_fields[db_field.name]), "class": get_ul_class(self.radio_fields[db_field.name]),
} }
) )
kwargs["empty_label"] = _("None") if db_field.blank else None kwargs["empty_label"] = (
kwargs.get("empty_label", _("None")) if db_field.blank else None
)
if "queryset" not in kwargs: if "queryset" not in kwargs:
queryset = self.get_field_queryset(db, db_field, request) queryset = self.get_field_queryset(db, db_field, request)

12
tests/admin_widgets/tests.py
View File

@ -21,6 +21,7 @@ from django.db.models import (
CharField, CharField,
DateField, DateField,
DateTimeField, DateTimeField,
ForeignKey,
ManyToManyField, ManyToManyField,
UUIDField, UUIDField,
) )
@ -141,6 +142,17 @@ class AdminFormfieldForDBFieldTests(SimpleTestCase):
) )
self.assertIsNone(ff.empty_label) self.assertIsNone(ff.empty_label)
def test_radio_fields_foreignkey_formfield_overrides_empty_label(self):
class MyModelAdmin(admin.ModelAdmin):
radio_fields = {"parent": admin.VERTICAL}
formfield_overrides = {
ForeignKey: {"empty_label": "Custom empty label"},
}
ma = MyModelAdmin(Inventory, admin.site)
ff = ma.formfield_for_dbfield(Inventory._meta.get_field("parent"), request=None)
self.assertEqual(ff.empty_label, "Custom empty label")
def test_many_to_many(self): def test_many_to_many(self):
self.assertFormfield(Band, "members", forms.SelectMultiple) self.assertFormfield(Band, "members", forms.SelectMultiple)