diff options
| -rw-r--r-- | hyperkitty/urls.py | 11 | ||||
| -rw-r--r-- | hyperkitty/views/accounts.py | 5 |
2 files changed, 6 insertions, 10 deletions
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'), diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py index 2ee36da..21f0fad 100644 --- a/hyperkitty/views/accounts.py +++ b/hyperkitty/views/accounts.py @@ -46,11 +46,6 @@ from hyperkitty.lib import get_store logger = logging.getLogger(__name__) -def user_logout(request): - logout(request) - return redirect('user_login') - - @login_required def user_profile(request, user_email=None): if not request.user.is_authenticated(): |