diff options
| author | Honza Král <Honza.Kral@gmail.com> | 2013-02-23 14:34:57 -0800 |
|---|---|---|
| committer | Honza Král <Honza.Kral@gmail.com> | 2013-02-23 14:34:57 -0800 |
| commit | 692902b227b4aff8a4ec66fa8d4ac2d3128bcac0 (patch) | |
| tree | af1362ef46d444df7c28a506339be3efcc2738cb /django | |
| parent | ef1e6ef1eb5495b168f9fc642eca235e71e51dde (diff) | |
| parent | 67dd54dc841a93a67eac87dc13ed047d72f920dc (diff) | |
Merge pull request #778 from viciu/19609
Fixed #19609: admin Inlines doesn't display help_text for readonly fields
Diffstat (limited to 'django')
| -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 |