summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorPaulo <commonzenpython@gmail.com>2016-06-18 22:03:25 -0400
committerTim Graham <timograham@gmail.com>2016-06-21 14:32:19 -0400
commitc464cf88ff5eeabea0109daee35dba8a32f8644d (patch)
tree0e45c54d87fdd04be219564d83508b3bf6d7e016 /django
parente725a68bcce4106fa3e1e8ecb0145ddef03d9005 (diff)
[1.10.x] Fixed #26729 -- Allowed overriding a form field's label/help_text in Form.__init__() for TabularInline.
Backport of 9c2d5a8d333277cc1b482a9d05f174cf4d09f24c from master
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/helpers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index a9db82ae78..d5cf38e2ea 100644
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@@ -279,7 +279,7 @@ class InlineAdminFormSet(object):
'help_text': help_text_for_field(field_name, self.opts.model),
}
else:
- form_field = self.formset.form.base_fields[field_name]
+ form_field = self.formset.empty_form.fields[field_name]
label = form_field.label
if label is None:
label = label_for_field(field_name, self.opts.model, self.opts)