1
0
mirror of https://github.com/django/django.git synced 2025-03-11 18:02:35 +00:00

Fixed #34905 -- Corrected admin's main content element rendered in <main> tag.

Regression in 91e617c743b21a0ebad01f18623a8b31f6f58500.

Thanks Tom Carrick for the report.
This commit is contained in:
ontowhee 2023-10-19 08:25:50 -07:00 committed by GitHub
parent 71a813a72c
commit 89d2ae257b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions

View File

@ -81,13 +81,13 @@
{% endblock %}
{% endif %}
<main class="main" id="main">
<div class="main" id="main">
{% if not is_popup and is_nav_sidebar_enabled %}
{% block nav-sidebar %}
{% include "admin/nav_sidebar.html" %}
{% endblock %}
{% endif %}
<div id="content-start" class="content" tabindex="-1">
<main id="content-start" class="content" tabindex="-1">
{% block messages %}
{% if messages %}
<ul class="messagelist">{% for message in messages %}
@ -109,8 +109,8 @@
</div>
<!-- END Content -->
{% block footer %}<div id="footer"></div>{% endblock %}
</div>
</main>
</main>
</div>
</div>
<!-- END Container -->

View File

@ -42,7 +42,7 @@ class AdminSidebarTests(TestCase):
def test_sidebar_not_on_index(self):
response = self.client.get(reverse("test_with_sidebar:index"))
self.assertContains(response, '<main class="main" id="main">')
self.assertContains(response, '<div class="main" id="main">')
self.assertNotContains(
response, '<nav class="sticky" id="nav-sidebar" aria-label="Sidebar">'
)

View File

@ -1598,6 +1598,13 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
response = self.client.get(reverse("admin:login"))
self.assertContains(response, '<header id="header">')
def test_main_content(self):
response = self.client.get(reverse("admin:index"))
self.assertContains(
response,
'<main id="content-start" class="content" tabindex="-1">',
)
@override_settings(
AUTH_PASSWORD_VALIDATORS=[