p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #35755 -- Hid help text of hidden fields in admin fieldsets. 

Regression in 96a598356a.
This commit is contained in:
Richard Laager 2024-09-11 22:45:55 -05:00 committed by Sarah Boyce
parent b2501759eb
commit 16af0c60ed
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/templates/admin/includes/fieldset.html
View File

@ -27,7 +27,7 @@
{% endif %}
</div>
{% if field.field.help_text %}
<div class="help"{% if field.field.id_for_label %} id="{{ field.field.id_for_label }}_helptext"{% endif %}>
<div class="help{% if field.field.is_hidden %} hidden{% endif %}"{% if field.field.id_for_label %} id="{{ field.field.id_for_label }}_helptext"{% endif %}>
<div>{{ field.field.help_text|safe }}</div>
</div>
{% endif %}

2
tests/admin_inlines/models.py
View File

@ -332,7 +332,7 @@ class SomeParentModel(models.Model):
class SomeChildModel(models.Model):
name = models.CharField(max_length=1)
position = models.PositiveIntegerField()
position = models.PositiveIntegerField(help_text="Position help_text.")
parent = models.ForeignKey(SomeParentModel, models.CASCADE)
readonly_field = models.CharField(max_length=1)

28
tests/admin_inlines/tests.py
View File

@ -349,7 +349,12 @@ class TestInline(TestDataMixin, TestCase):
)
response = self.client.get(url)
self.assertInHTML(
'<th class="column-position hidden">Position</th>',
'<th class="column-position hidden">Position'
'<img src="/static/admin/img/icon-unknown.svg" '
'class="help help-tooltip" width="10" height="10" '
'alt="(Position help_text.)" '
'title="Position help_text.">'
"</th>",
response.rendered_content,
)
self.assertInHTML(
@ -379,13 +384,15 @@ class TestInline(TestDataMixin, TestCase):
self.assertInHTML(
'<div class="flex-container fieldBox field-position hidden">'
'<label class="inline">Position:</label>'
'<div class="readonly">0</div></div>',
'<div class="readonly">0</div></div>'
'<div class="help hidden"><div>Position help_text.</div></div>',
response.rendered_content,
)
self.assertInHTML(
'<div class="flex-container fieldBox field-position hidden">'
'<label class="inline">Position:</label>'
'<div class="readonly">1</div></div>',
'<div class="readonly">1</div></div>'
'<div class="help hidden"><div>Position help_text.</div></div>',
response.rendered_content,
)
@ -407,13 +414,17 @@ class TestInline(TestDataMixin, TestCase):
self.assertInHTML(
'<div class="form-row hidden field-position">'
'<div><div class="flex-container"><label>Position:</label>'
'<div class="readonly">0</div></div></div></div>',
'<div class="readonly">0</div></div>'
'<div class="help hidden"><div>Position help_text.</div></div>'
"</div></div>",
response.rendered_content,
)
self.assertInHTML(
'<div class="form-row hidden field-position">'
'<div><div class="flex-container"><label>Position:</label>'
'<div class="readonly">1</div></div></div></div>',
'<div class="readonly">1</div></div>'
'<div class="help hidden"><div>Position help_text.</div></div>'
"</div></div>",
response.rendered_content,
)
@ -448,7 +459,12 @@ class TestInline(TestDataMixin, TestCase):
self.assertInHTML(
'<thead><tr><th class="original"></th>'
'<th class="column-name required">Name</th>'
'<th class="column-position required hidden">Position</th>'
'<th class="column-position required hidden">Position'
'<img src="/static/admin/img/icon-unknown.svg" '
'class="help help-tooltip" width="10" height="10" '
'alt="(Position help_text.)" '
'title="Position help_text.">'
"</th>"
"<th>Delete?</th></tr></thead>",
response.rendered_content,
)