diff options
| author | Wiktor Kolodziej <wiktor@pykonik.org> | 2013-02-23 18:24:32 +0100 |
|---|---|---|
| committer | Wiktor Kolodziej <wiktor@pykonik.org> | 2013-02-23 18:24:32 +0100 |
| commit | 67dd54dc841a93a67eac87dc13ed047d72f920dc (patch) | |
| tree | 6dd0dc2022cae6b060603501eaf119f96028c6b2 /django/contrib/admin | |
| parent | f3ae67a62f5bdcee892f19667967e8738f734908 (diff) | |
Fixed #19609: admin Inlines doesn't display help_text for readonly fields
Refactoring: field was renamed to field_name, since flatten_fieldsets returns field name, not field.
Original patch from Marc Aymerich Gubern
Diffstat (limited to 'django/contrib/admin')
| -rw-r--r-- | django/contrib/admin/helpers.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 4203287123..adc2302587 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -224,19 +224,20 @@ class InlineAdminFormSet(object): def fields(self): fk = getattr(self.formset, "fk", None) - for i, field in enumerate(flatten_fieldsets(self.fieldsets)): - if fk and fk.name == field: + for i, field_name in enumerate(flatten_fieldsets(self.fieldsets)): + if fk and fk.name == field_name: continue - if field in self.readonly_fields: + if field_name in self.readonly_fields: yield { - 'label': label_for_field(field, self.opts.model, self.opts), + 'label': label_for_field(field_name, self.opts.model, self.opts), 'widget': { 'is_hidden': False }, - 'required': False + 'required': False, + 'help_text': help_text_for_field(field_name, self.opts.model), } else: - yield self.formset.form.base_fields[field] + yield self.formset.form.base_fields[field_name] def _media(self): media = self.opts.media + self.formset.media |