Fixed #29184 -- Made TabularInline respect model form's Meta.labels and help_texts.

3 files changed, 19 insertions, 0 deletions

diff --git a/tests/admin_inlines/admin.py b/tests/admin_inlines/admin.py
index 1370484313..a56704865d 100644
--- a/tests/admin_inlines/admin.py
+++ b/tests/admin_inlines/admin.py
@@ -206,6 +206,8 @@ class SomeChildModelForm(forms.ModelForm):
         widgets = {
             'position': forms.HiddenInput,
         }
+        labels = {'readonly_field': 'Label from ModelForm.Meta'}
+        help_texts = {'readonly_field': 'Help text from ModelForm.Meta'}
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -215,6 +217,7 @@ class SomeChildModelForm(forms.ModelForm):
 class SomeChildModelInline(admin.TabularInline):
     model = SomeChildModel
     form = SomeChildModelForm
+    readonly_fields = ('readonly_field',)
 
 
 site.register(TitleCollection, inlines=[TitleInline])
diff --git a/tests/admin_inlines/models.py b/tests/admin_inlines/models.py
index e23ea6d8f6..94134660e5 100644
--- a/tests/admin_inlines/models.py
+++ b/tests/admin_inlines/models.py
@@ -248,6 +248,7 @@ class SomeChildModel(models.Model):
     name = models.CharField(max_length=1)
     position = models.PositiveIntegerField()
     parent = models.ForeignKey(SomeParentModel, models.CASCADE)
+    readonly_field = models.CharField(max_length=1)
 
 # Other models
 
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
index 73b1bd065e..1bf9b34e77 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -175,6 +175,21 @@ class TestInline(TestDataMixin, TestCase):
             1
         )
 
+    def test_tabular_model_form_meta_readonly_field(self):
+        """
+        Tabular inlines use ModelForm.Meta.help_texts and labels for read-only
+        fields.
+        """
+        response = self.client.get(reverse('admin:admin_inlines_someparentmodel_add'))
+        self.assertContains(
+            response,
+            '<img src="/static/admin/img/icon-unknown.svg" '
+            'class="help help-tooltip" width="10" height="10" '
+            'alt="(Help text from ModelForm.Meta)" '
+            'title="Help text from ModelForm.Meta">'
+        )
+        self.assertContains(response, 'Label from ModelForm.Meta')
+
     def test_inline_hidden_field_no_column(self):
         """#18263 -- Make sure hidden fields don't get a column in tabular inlines"""
         parent = SomeParentModel.objects.create(name='a')