p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #31865 -- Adjusted admin nav sidebar template to reduce debug logging. 

Thanks to Mariusz Felisiak for review.
This commit is contained in:
Carlton Gibson 2020-08-11 10:11:42 +02:00 committed by Carlton Gibson
parent 8a5683b6b2
commit 0aeb802cf0
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/templates/admin/nav_sidebar.html
View File

@ -1,5 +1,5 @@
{% load i18n %} {% load i18n %}
<button class="sticky toggle-nav-sidebar" id="toggle-nav-sidebar" aria-label="{% translate 'Toggle navigation' %}"></button> <button class="sticky toggle-nav-sidebar" id="toggle-nav-sidebar" aria-label="{% translate 'Toggle navigation' %}"></button>
<nav class="sticky" id="nav-sidebar"> <nav class="sticky" id="nav-sidebar">
{% include 'admin/app_list.html' with app_list=available_apps %} {% include 'admin/app_list.html' with app_list=available_apps show_changelinks=False %}
</nav> </nav>

3
docs/releases/3.1.1.txt
View File

@ -17,3 +17,6 @@ Bugfixes
* Fixed encoding session data while upgrading multiple instances of the same * Fixed encoding session data while upgrading multiple instances of the same
project to Django 3.1 (:ticket:`31864`). project to Django 3.1 (:ticket:`31864`).
* Adjusted admin's navigation sidebar template to reduce debug logging when
rendering (:ticket:`31865`).

8
tests/admin_views/test_nav_sidebar.py
View File

@ -77,6 +77,14 @@ class AdminSidebarTests(TestCase):
self.assertContains(response, '<a href="%s">Users</a>' % url) self.assertContains(response, '<a href="%s">Users</a>' % url)
self.assertNotContains(response, 'aria-current') self.assertNotContains(response, 'aria-current')
@override_settings(DEBUG=True)
def test_included_app_list_template_context_fully_set(self):
# All context variables should be set when rendering the sidebar.
url = reverse('test_with_sidebar:auth_user_changelist')
with self.assertRaisesMessage(AssertionError, 'no logs'):
with self.assertLogs('django.template', 'DEBUG'):
self.client.get(url)
@override_settings(ROOT_URLCONF='admin_views.test_nav_sidebar') @override_settings(ROOT_URLCONF='admin_views.test_nav_sidebar')
class SeleniumTests(AdminSeleniumTestCase): class SeleniumTests(AdminSeleniumTestCase):