diff options
| author | Carlton Gibson <carlton.gibson@noumenal.es> | 2020-08-11 10:11:42 +0200 |
|---|---|---|
| committer | Carlton Gibson <carlton@noumenal.es> | 2020-08-11 11:42:15 +0200 |
| commit | 0aeb802cf054cb369646c871b53c93a83c1fa58a (patch) | |
| tree | aff56fba69ae1d53eb5723759eca325adb513551 | |
| parent | 8a5683b6b2aede38edcff070686ed1fce470dec5 (diff) | |
Fixed #31865 -- Adjusted admin nav sidebar template to reduce debug logging.
Thanks to Mariusz Felisiak for review.
| -rw-r--r-- | django/contrib/admin/templates/admin/nav_sidebar.html | 2 | ||||
| -rw-r--r-- | docs/releases/3.1.1.txt | 3 | ||||
| -rw-r--r-- | tests/admin_views/test_nav_sidebar.py | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/nav_sidebar.html b/django/contrib/admin/templates/admin/nav_sidebar.html index 9fde4c28e1..32c5b8f839 100644 --- a/django/contrib/admin/templates/admin/nav_sidebar.html +++ b/django/contrib/admin/templates/admin/nav_sidebar.html @@ -1,5 +1,5 @@ {% load i18n %} <button class="sticky toggle-nav-sidebar" id="toggle-nav-sidebar" aria-label="{% translate 'Toggle navigation' %}"></button> <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> diff --git a/docs/releases/3.1.1.txt b/docs/releases/3.1.1.txt index c8201d4e41..c777b3cc60 100644 --- a/docs/releases/3.1.1.txt +++ b/docs/releases/3.1.1.txt @@ -17,3 +17,6 @@ Bugfixes * Fixed encoding session data while upgrading multiple instances of the same project to Django 3.1 (:ticket:`31864`). + +* Adjusted admin's navigation sidebar template to reduce debug logging when + rendering (:ticket:`31865`). diff --git a/tests/admin_views/test_nav_sidebar.py b/tests/admin_views/test_nav_sidebar.py index 01cd4cfee7..b3d4955b19 100644 --- a/tests/admin_views/test_nav_sidebar.py +++ b/tests/admin_views/test_nav_sidebar.py @@ -77,6 +77,14 @@ class AdminSidebarTests(TestCase): self.assertContains(response, '<a href="%s">Users</a>' % url) 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') class SeleniumTests(AdminSeleniumTestCase): |