From 9d1987d7679165ad3a7c2b713a8a488cc1421905 Mon Sep 17 00:00:00 2001 From: Lukasz Balcerzak Date: Sat, 18 May 2013 22:15:10 +0200 Subject: [PATCH] Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices --- django/contrib/admin/options.py | 4 ++++ tests/admin_widgets/tests.py | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index b475868598d41..805868306d3ca 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -107,6 +107,7 @@ def validate(cls, model): validator.validate(cls, model) def __init__(self): + self._orig_formfield_overrides = self.formfield_overrides overrides = FORMFIELD_FOR_DBFIELD_DEFAULTS.copy() overrides.update(self.formfield_overrides) self.formfield_overrides = overrides @@ -123,6 +124,9 @@ def formfield_for_dbfield(self, db_field, **kwargs): # If the field specifies choices, we don't need to look for special # admin widgets - we just need to use a select widget of some kind. if db_field.choices: + # see #19303 for an explanation of self._orig_formfield_overrides + if db_field.__class__ in self._orig_formfield_overrides: + kwargs = dict(self._orig_formfield_overrides[db_field.__class__], **kwargs) return self.formfield_for_choice_field(db_field, request, **kwargs) # ForeignKey or ManyToManyFields diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index d2ecf46358f65..7d2f70f69b6e0 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -132,6 +132,23 @@ class BandAdmin(admin.ModelAdmin): self.assertEqual(f2.widget.attrs['maxlength'], '20') self.assertEqual(f2.widget.attrs['size'], '10') + def testFormfieldOverridesWidgetInstancesForFieldsWithChoices(self): + """ + Test that widget is actually overridden for fields with choices. + (#194303) + """ + class MemberAdmin(admin.ModelAdmin): + formfield_overrides = { + CharField: {'widget': forms.TextInput} + } + ma = MemberAdmin(models.Member, admin.site) + name_field = models.Member._meta.get_field('name') + gender_field = models.Member._meta.get_field('gender') + name = ma.formfield_for_dbfield(name_field, request=None) + gender = ma.formfield_for_dbfield(gender_field, request=None) + self.assertIsInstance(name.widget, forms.TextInput) + self.assertIsInstance(gender.widget, forms.TextInput) + def testFieldWithChoices(self): self.assertFormfield(models.Member, 'gender', forms.Select)