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

Fixed #34919 -- Added scope attribute to admindocs model templates.

This commit is contained in:
jedidiah 2023-11-08 12:08:50 +03:00 committed by Mariusz Felisiak
parent ad41f1c53a
commit bdf30b952c
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/admindocs/templates/admin_doc/model_detail.html
View File

@ -32,9 +32,9 @@
<table class="model"> <table class="model">
<thead> <thead>
<tr> <tr>
<th>{% translate 'Field' %}</th> <th scope="col">{% translate 'Field' %}</th>
<th>{% translate 'Type' %}</th> <th scope="col">{% translate 'Type' %}</th>
<th>{% translate 'Description' %}</th> <th scope="col">{% translate 'Description' %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -55,9 +55,9 @@
<table class="model"> <table class="model">
<thead> <thead>
<tr> <tr>
<th>{% translate 'Method' %}</th> <th scope="col">{% translate 'Method' %}</th>
<th>{% translate 'Arguments' %}</th> <th scope="col">{% translate 'Arguments' %}</th>
<th>{% translate 'Description' %}</th> <th scope="col">{% translate 'Description' %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
django/contrib/admindocs/templates/admin_doc/model_index.html
View File

@ -27,7 +27,7 @@
<table class="xfull"> <table class="xfull">
{% for model in group.list %} {% for model in group.list %}
<tr> <tr>
<th><a href="{% url 'django-admindocs-models-detail' app_label=model.app_label model_name=model.model_name %}">{{ model.object_name }}</a></th> <th scope="col"><a href="{% url 'django-admindocs-models-detail' app_label=model.app_label model_name=model.model_name %}">{{ model.object_name }}</a></th>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>

14
tests/admin_docs/test_views.py
View File

@ -240,6 +240,20 @@ class TestModelDetailView(TestDataMixin, AdminDocsTestCase):
reverse("django-admindocs-models-detail", args=["admin_docs", "Person"]) reverse("django-admindocs-models-detail", args=["admin_docs", "Person"])
) )
def test_table_headers(self):
tests = [
("Method", 1),
("Arguments", 1),
("Description", 2),
("Field", 1),
("Type", 1),
("Method", 1),
]
for table_header, count in tests:
self.assertContains(
self.response, f'<th scope="col">{table_header}</th>', count=count
)
def test_method_excludes(self): def test_method_excludes(self):
""" """
Methods that begin with strings defined in Methods that begin with strings defined in