From dbfb35b54225b7f3cf188ea6dba143a589924a0f Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Fri, 22 Jul 2005 00:49:53 +0000
Subject: Fixed #145 -- Changed admin logout to use views.auth.login.logout,
 which uses redirects to ensure cookies aren't stale. Thanks,
 sdelatorre@gmail.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/admin_templates/logged_out.html              | 9 ---------
 django/conf/admin_templates/registration/logged_out.html | 9 +++++++++
 django/conf/urls/admin.py                                | 2 +-
 django/views/admin/main.py                               | 8 --------
 4 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 django/conf/admin_templates/logged_out.html
 create mode 100644 django/conf/admin_templates/registration/logged_out.html

diff --git a/django/conf/admin_templates/logged_out.html b/django/conf/admin_templates/logged_out.html
deleted file mode 100644
index 30b80a78e2..0000000000
--- a/django/conf/admin_templates/logged_out.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "base_site" %}
-
-{% block content %}
-
-<p>Thanks for spending some quality time with the Web site today.</p>
-
-<p><a href="/admin/">Log in again</a></p>
-
-{% endblock %}
diff --git a/django/conf/admin_templates/registration/logged_out.html b/django/conf/admin_templates/registration/logged_out.html
new file mode 100644
index 0000000000..30b80a78e2
--- /dev/null
+++ b/django/conf/admin_templates/registration/logged_out.html
@@ -0,0 +1,9 @@
+{% extends "base_site" %}
+
+{% block content %}
+
+<p>Thanks for spending some quality time with the Web site today.</p>
+
+<p><a href="/admin/">Log in again</a></p>
+
+{% endblock %}
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
-- 
cgit v1.3