ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed login/logout urls.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-14 09:42:30 +02:00
parent a792cd4c15
commit e84861211a
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openslides/participant/urls.py
View File

@ -103,15 +103,3 @@ urlpatterns = patterns('participant.views',
name='print_passwords', 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',
)
)

15
openslides/urls.py
View File

@ -29,8 +29,8 @@ urlpatterns = patterns('',
(r'^application/', include('application.urls')), (r'^application/', include('application.urls')),
(r'^assignment/', include('assignment.urls')), (r'^assignment/', include('assignment.urls')),
(r'^participant/', include('participant.urls')), (r'^participant/', include('participant.urls')),
(r'config/', include('system.urls')), (r'^config/', include('system.urls')),
(r'projector/', include('projector.urls')), (r'^projector/', include('projector.urls')),
(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_DOC_ROOT}), (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_DOC_ROOT}),
(r'^i18n/', include('django.conf.urls.i18n')), (r'^i18n/', include('django.conf.urls.i18n')),
) )
@ -47,4 +47,15 @@ for plugin in settings.INSTALLED_PLUGINS:
urlpatterns += patterns('', urlpatterns += patterns('',
(r'^500/$', 'openslides.utils.views.server_error'), (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',
)
) )