diff options
| author | Jones Ambrosi <jones.ambrosi@softdesign.com.br> | 2019-05-28 14:57:31 -0300 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-06-04 10:27:12 +0200 |
| commit | f9561144d79bad88ee5781e3b2c09fb7c8f7fd7d (patch) | |
| tree | 80ad2e0deed24019a6181b2b590d8cd465f4b3fd /django/contrib/admin/helpers.py | |
| parent | aa94f7c899b98f547fc1d26797ba892c38eaf415 (diff) | |
Fixed #30520 -- Fixed crash of admin model inlines on custom fields without labels.
Diffstat (limited to 'django/contrib/admin/helpers.py')
| -rw-r--r-- | django/contrib/admin/helpers.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 83719f4346..0337c50010 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -280,7 +280,12 @@ class InlineAdminFormSet: if not self.has_change_permission or field_name in self.readonly_fields: yield { 'name': field_name, - 'label': meta_labels.get(field_name) or 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, + form=empty_form, + ), 'widget': {'is_hidden': False}, 'required': False, 'help_text': meta_help_texts.get(field_name) or help_text_for_field(field_name, self.opts.model), @@ -289,7 +294,7 @@ class InlineAdminFormSet: 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) + label = label_for_field(field_name, self.opts.model, self.opts, form=empty_form) yield { 'name': field_name, 'label': label, |