diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-08-31 20:11:28 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2008-08-31 20:11:28 +0000 |
| commit | 8b11341a9a706f2a239d9e4eec1c093b4e93fecb (patch) | |
| tree | 5ca519af1c2e33d1fa3d70a86ac45c3138908b14 | |
| parent | 3b6395370480f44f180c6287e70ea569cd20f0d4 (diff) | |
Fixed `ModelAdmin.radio_fields` to work with the new `TypedChoiceField`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/options.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 62e4aaedc3..f01edbcb28 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -51,12 +51,12 @@ class BaseModelAdmin(object): if db_field.choices: if db_field.name in self.radio_fields: # If the field is named as a radio_field, use a RadioSelect - kwargs['widget'] = widgets.AdminRadioSelect( - choices=db_field.get_choices(include_blank=db_field.blank, - blank_choice=[('', _('None'))]), - attrs={ - 'class': get_ul_class(self.radio_fields[db_field.name]), - } + kwargs['widget'] = widgets.AdminRadioSelect(attrs={ + 'class': get_ul_class(self.radio_fields[db_field.name]), + }) + kwargs['choices'] = db_field.get_choices( + include_blank = db_field.blank, + blank_choice=[('', _('None'))] ) return db_field.formfield(**kwargs) else: |