From e84861211a83c4a9809e03c322f642ea1bbef049 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 14 Apr 2012 09:42:30 +0200 Subject: [PATCH] Fixed login/logout urls. --- openslides/participant/urls.py | 12 ------------ openslides/urls.py | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/openslides/participant/urls.py b/openslides/participant/urls.py index 5284b0bb2..f24f99b4d 100644 --- a/openslides/participant/urls.py +++ b/openslides/participant/urls.py @@ -103,15 +103,3 @@ urlpatterns = patterns('participant.views', name='print_passwords', ), ) - -urlpatterns += patterns('django.contrib.auth.views', - url(r'^login/$', - 'login', - {'template_name': 'participant/login.html'}, - name='user_login', - ), - url(r'^logout/$', - 'logout_then_login', - name='user_logout', - ) -) diff --git a/openslides/urls.py b/openslides/urls.py index de1181d4e..4531d4941 100644 --- a/openslides/urls.py +++ b/openslides/urls.py @@ -29,8 +29,8 @@ urlpatterns = patterns('', (r'^application/', include('application.urls')), (r'^assignment/', include('assignment.urls')), (r'^participant/', include('participant.urls')), - (r'config/', include('system.urls')), - (r'projector/', include('projector.urls')), + (r'^config/', include('system.urls')), + (r'^projector/', include('projector.urls')), (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_DOC_ROOT}), (r'^i18n/', include('django.conf.urls.i18n')), ) @@ -47,4 +47,15 @@ for plugin in settings.INSTALLED_PLUGINS: urlpatterns += patterns('', (r'^500/$', 'openslides.utils.views.server_error'), + + url(r'^login/$', + 'django.contrib.auth.views.login', + {'template_name': 'participant/login.html'}, + name='user_login', + ), + + url(r'^logout/$', + 'django.contrib.auth.views.logout_then_login', + name='user_logout', + ) )