diff options
| -rw-r--r-- | django/conf/admin_templates/registration/logged_out.html (renamed from django/conf/admin_templates/logged_out.html) | 0 | ||||
| -rw-r--r-- | django/conf/urls/admin.py | 2 | ||||
| -rw-r--r-- | django/views/admin/main.py | 8 |
3 files changed, 1 insertions, 9 deletions
diff --git a/django/conf/admin_templates/logged_out.html b/django/conf/admin_templates/registration/logged_out.html index 30b80a78e2..30b80a78e2 100644 --- a/django/conf/admin_templates/logged_out.html +++ b/django/conf/admin_templates/registration/logged_out.html diff --git a/django/conf/urls/admin.py b/django/conf/urls/admin.py index 92d5d1bc9e..a55da5d366 100644 --- a/django/conf/urls/admin.py +++ b/django/conf/urls/admin.py @@ -3,7 +3,7 @@ from django.conf.settings import INSTALLED_APPS urlpatterns = ( ('^/?$', 'django.views.admin.main.index'), - ('^logout/$', 'django.views.admin.main.logout'), + ('^logout/$', 'django.views.auth.login.logout'), ('^password_change/$', 'django.views.registration.passwords.password_change'), ('^password_change/done/$', 'django.views.registration.passwords.password_change_done'), ('^template_validator/$', 'django.views.admin.template.template_validator'), diff --git a/django/views/admin/main.py b/django/views/admin/main.py index f5772ef547..f413e79123 100644 --- a/django/views/admin/main.py +++ b/django/views/admin/main.py @@ -50,14 +50,6 @@ def index(request): c = Context(request, {'title': 'Site administration'}) return HttpResponse(t.render(c)) -def logout(request): - request.session.delete() - t = template_loader.get_template('logged_out') - c = Context(request, { - 'title': "You're logged out", - }) - return HttpResponse(t.render(c)) - def change_list(request, app_label, module_name): from django.core import paginator from django.utils import dateformat |