From 60d04970e27e21a622a568b381811ca7256f6db1 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 7 Feb 2013 09:51:31 +0100
Subject: Use the logout view provided by Django

---
 hyperkitty/urls.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'hyperkitty/urls.py')

diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py
index 82a7b72..f86b937 100644
--- a/hyperkitty/urls.py
+++ b/hyperkitty/urls.py
@@ -27,23 +27,24 @@ from api import EmailResource, ThreadResource, SearchResource
 
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.contrib.auth.views import login as login_view
+from django.contrib.auth.views import logout as logout_view
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('hyperkitty.views',
+    # Index
+    url(r'^/$', 'pages.index', name='index'),
+    url(r'^$', 'pages.index', name='root'),
+
     # Account
     url(r'^accounts/login/$', login_view, {'template_name': 'login.html'}, name='user_login'),
-    url(r'^accounts/logout/$', 'accounts.user_logout', name='user_logout'),
+    url(r'^accounts/logout/$', logout_view, {'next_page': '/'}, name='user_logout'),
     url(r'^accounts/profile/$', 'accounts.user_profile', name='user_profile'),
     url(r'^accounts/register/$', 'accounts.user_registration', name='user_registration'),
 
 
-    # Index
-    url(r'^/$', 'pages.index', name='index'),
-    url(r'^$', 'pages.index', name='root'),
-
     # List archives and overview
     url(r'^list/(?P<mlist_fqdn>[^/@]+@[^/@]+)/(?P<year>\d{4})/(?P<month>\d\d?)/(?P<day>\d\d?)/$',
         'list.archives', name='archives_with_day'),
-- 
cgit