diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index 414d1b4..6c76bcb 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -309,9 +309,8 @@ class AdminSite(object): defaults = { 'current_app': self.name, 'extra_context': extra_context or {}, + 'template_name': self.logout_template or 'admin/logged_out.html' } - if self.logout_template is not None: - defaults['template_name'] = self.logout_template return logout(request, **defaults) @never_cache diff --git a/django/contrib/admin/templates/admin/logged_out.html b/django/contrib/admin/templates/admin/logged_out.html new file mode 100644 index 0000000..6a18186 --- /dev/null +++ b/django/contrib/admin/templates/admin/logged_out.html @@ -0,0 +1,12 @@ +{% extends "admin/base_site.html" %} +{% load i18n %} + +{% block breadcrumbs %}
{% endblock %} + +{% block content %} + +{% trans "Thanks for spending some quality time with the Web site today." %}
+ + + +{% endblock %} diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 8e678a7..01cd01f 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -3994,7 +3994,7 @@ class AdminViewLogoutTest(TestCase): def test_client_logout_url_can_be_used_to_login(self): response = self.client.get('/test_admin/admin/logout/') self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, 'registration/logged_out.html') + self.assertTemplateUsed(response, 'admin/logged_out.html') self.assertEqual(response.request['PATH_INFO'], '/test_admin/admin/logout/') # we are now logged out diff --git a/tests/templates/custom_admin/logout.html b/tests/templates/custom_admin/logout.html index 3a9301b..bc37a6c 100644 --- a/tests/templates/custom_admin/logout.html +++ b/tests/templates/custom_admin/logout.html @@ -1,4 +1,4 @@ -{% extends "registration/logged_out.html" %} +{% extends "admin/logged_out.html" %} {% block content %} Hello from a custom logout template