innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

This commit is contained in:
Hasan Ramezani 2018-03-09 01:49:02 +03:30 committed by Tim Graham
parent 3c4ff21763
commit 274e3e27f3
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/contrib/admin/helpers.py
View File

@ -258,18 +258,21 @@ class InlineAdminFormSet:
def fields(self): def fields(self):
fk = getattr(self.formset, "fk", None) 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)): for i, field_name in enumerate(flatten_fieldsets(self.fieldsets)):
if fk and fk.name == field_name: if fk and fk.name == field_name:
continue continue
if field_name in self.readonly_fields: if field_name in self.readonly_fields:
yield { 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}, 'widget': {'is_hidden': False},
'required': 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: else:
form_field = self.formset.empty_form.fields[field_name] form_field = empty_form.fields[field_name]
label = form_field.label label = form_field.label
if label is None: 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)

3
tests/admin_inlines/admin.py
View File

@ -206,6 +206,8 @@ class SomeChildModelForm(forms.ModelForm):
widgets = { widgets = {
'position': forms.HiddenInput, 'position': forms.HiddenInput,
} }
labels = {'readonly_field': 'Label from ModelForm.Meta'}
help_texts = {'readonly_field': 'Help text from ModelForm.Meta'}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -215,6 +217,7 @@ class SomeChildModelForm(forms.ModelForm):
class SomeChildModelInline(admin.TabularInline): class SomeChildModelInline(admin.TabularInline):
model = SomeChildModel model = SomeChildModel
form = SomeChildModelForm form = SomeChildModelForm
readonly_fields = ('readonly_field',)
site.register(TitleCollection, inlines=[TitleInline]) site.register(TitleCollection, inlines=[TitleInline])

1
tests/admin_inlines/models.py
View File

@ -248,6 +248,7 @@ class SomeChildModel(models.Model):
name = models.CharField(max_length=1) name = models.CharField(max_length=1)
position = models.PositiveIntegerField() position = models.PositiveIntegerField()
parent = models.ForeignKey(SomeParentModel, models.CASCADE) parent = models.ForeignKey(SomeParentModel, models.CASCADE)
readonly_field = models.CharField(max_length=1)
# Other models # Other models

15
tests/admin_inlines/tests.py
View File

@ -175,6 +175,21 @@ class TestInline(TestDataMixin, TestCase):
1 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): def test_inline_hidden_field_no_column(self):
"""#18263 -- Make sure hidden fields don't get a column in tabular inlines""" """#18263 -- Make sure hidden fields don't get a column in tabular inlines"""
parent = SomeParentModel.objects.create(name='a') parent = SomeParentModel.objects.create(name='a')