Ticket #29184: tabularinline_label_and_help_text_2.patch

django/contrib/admin/helpers.py

@@ -17 +17 @@
 ACTION_CHECKBOX_NAME = '_selected_action'
 
 
+def get_field_label_and_help_text(form, field_name, model_admin):
+    if form._meta.labels and field_name in form._meta.labels:
+        label = form._meta.labels[field_name]
+    else:
+        label = label_for_field(field_name, form._meta.model, model_admin)
+
+    if form._meta.help_texts and field_name in form._meta.help_texts:
+        help_text = form._meta.help_texts[field_name]
+    else:
+        help_text = help_text_for_field(field_name, form._meta.model)
+
+    return (label, help_text)
+
+
 class ActionForm(forms.Form):
     action = forms.ChoiceField(label=_('Action:'))
     select_across = forms.BooleanField(
@@ -164 +178 @@
         else:
             class_name = field
 
-        if form._meta.labels and class_name in form._meta.labels:
-            label = form._meta.labels[class_name]
-        else:
-            label = label_for_field(field, form._meta.model, model_admin)
-
-        if form._meta.help_texts and class_name in form._meta.help_texts:
-            help_text = form._meta.help_texts[class_name]
-        else:
-            help_text = help_text_for_field(class_name, form._meta.model)
+        label, help_text = get_field_label_and_help_text(form, class_name, model_admin)
 
         self.field = {
             'name': class_name,
@@ -261 +267 @@
         for i, field_name in enumerate(flatten_fieldsets(self.fieldsets)):
             if fk and fk.name == field_name:
                 continue
+            form = self.formset.empty_form
             if field_name in self.readonly_fields:
-                yield {
-                    'label': 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),
-                }
+                label, help_text = get_field_label_and_help_text(form, field_name, self.opts)
+                widget = {'is_hidden': False}
+                required = False
             else:
-                form_field = self.formset.empty_form.fields[field_name]
+                form_field = form.fields[field_name]
                 label = form_field.label
                 if label is None:
                     label = label_for_field(field_name, self.opts.model, self.opts)
-                yield {
-                    'label': label,
-                    'widget': form_field.widget,
-                    'required': form_field.required,
-                    'help_text': form_field.help_text,
-                }
+                help_text = form_field.help_text
+                widget = form_field.widget
+                required = form_field.required
+            yield {
+                'label': label,
+                'widget': widget,
+                'required': required,
+                'help_text': help_text,
+            }
 
     def inline_formset_data(self):
         verbose_name = self.opts.verbose_name