diff options
| author | Lukasz Balcerzak <lukaszbalcerzak@gmail.com> | 2013-05-18 22:15:10 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-08-22 11:50:52 -0400 |
| commit | 9d1987d7679165ad3a7c2b713a8a488cc1421905 (patch) | |
| tree | 6353b7b07f2f55c6d7a2ef38d4759c9f56554a6e | |
| parent | 65cf82bd08631a7aa8d9dd007b2527476fa3304f (diff) | |
Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices
| -rw-r--r-- | django/contrib/admin/options.py | 4 | ||||
| -rw-r--r-- | tests/admin_widgets/tests.py | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index b475868598..805868306d 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -107,6 +107,7 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)): 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 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)): # 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 d2ecf46358..7d2f70f69b 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -132,6 +132,23 @@ class AdminFormfieldForDBFieldTests(TestCase): 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) |