diff options
| author | Hasan Ramezani <hasan.r67@gmail.com> | 2018-03-09 01:49:02 +0330 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-03-17 20:51:24 -0400 |
| commit | 274e3e27f366bddbf1bb13b40c3c7b95195c496e (patch) | |
| tree | e606d7a871903be12ca4eb56a36c7e75af7d63b7 /django | |
| parent | 3c4ff2176323dd20507e35658599da220fbe1741 (diff) | |
Fixed #29184 -- Made TabularInline respect model form's Meta.labels and help_texts.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/helpers.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index ea6e0012dd..f010ebb63e 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -258,18 +258,21 @@ class InlineAdminFormSet: def fields(self): fk = getattr(self.formset, "fk", None) + empty_form = self.formset.empty_form + meta_labels = empty_form._meta.labels or {} + meta_help_texts = empty_form._meta.help_texts or {} for i, field_name in enumerate(flatten_fieldsets(self.fieldsets)): if fk and fk.name == field_name: continue if field_name in self.readonly_fields: yield { - 'label': label_for_field(field_name, self.opts.model, self.opts), + 'label': meta_labels.get(field_name) or label_for_field(field_name, self.opts.model, self.opts), 'widget': {'is_hidden': False}, 'required': False, - 'help_text': help_text_for_field(field_name, self.opts.model), + 'help_text': meta_help_texts.get(field_name) or help_text_for_field(field_name, self.opts.model), } else: - form_field = self.formset.empty_form.fields[field_name] + form_field = empty_form.fields[field_name] label = form_field.label if label is None: label = label_for_field(field_name, self.opts.model, self.opts) |