--- a/server/src/remieplt/urls.py Thu Sep 10 14:49:04 2015 +0200
+++ b/server/src/remieplt/urls.py Thu Sep 10 16:14:35 2015 +0200
@@ -19,11 +19,13 @@
from django.conf import settings
from django.conf.urls import include, url
from django.conf.urls.static import static
+from django.core.urlresolvers import reverse_lazy
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.views.generic import RedirectView
from django.contrib.auth.decorators import login_required
+
from remie.views import RemieSegmentsSingleView, RemieSegmentsGroupView, RemieMarkersView, RemieTeacherView, RemieIframeTesterView
js_info_dict = {
@@ -43,16 +45,16 @@
url(r'^accounts/', include('social.apps.django_app.urls', namespace='social')),
url(r'^accounts/login/$',pf_login,{'template_name': 'registration/login.html'},name='auth_login'),
- url(r'^accounts/cas/login/$', 'django_cas_ng.views.login'),
- url(r'^accounts/cas/logout/$', 'django_cas_ng.views.logout'),
+ url(r'^accounts/cas/login/$', 'django_cas_ng.views.login', name='cas_login'),
+ url(r'^accounts/cas/logout/$', 'django_cas_ng.views.logout', name='cas_logout'),
url(r'^oauth/', include('oauth_provider.urls')),
url(r'^remie/iframetester$', RemieIframeTesterView.as_view(), name="remie_iframe_tester"),
- url(r'^remie/workunit/segments_group$', login_required(RemieSegmentsGroupView.as_view(), login_url="/accounts/cas/login/"), name="remie_segments_group"),
- url(r'^remie/workunit/segments_single$', login_required(RemieSegmentsSingleView.as_view(), login_url="/accounts/cas/login/"), name="remie_segments_single"),
- url(r'^remie/workunit/markers', login_required(RemieMarkersView.as_view(), login_url="/accounts/cas/login/"), name="remie_markers"),
- url(r'^remie/workunit/teacher', login_required(RemieTeacherView.as_view(), login_url="/accounts/cas/login/"), name="remie_teacher"),
+ url(r'^remie/workunit/segments_group$', login_required(RemieSegmentsGroupView.as_view(), login_url=reverse_lazy('cas_login')), name="remie_segments_group"),
+ url(r'^remie/workunit/segments_single$', login_required(RemieSegmentsSingleView.as_view(), login_url=reverse_lazy('cas_login')), name="remie_segments_single"),
+ url(r'^remie/workunit/markers', login_required(RemieMarkersView.as_view(), login_url=reverse_lazy('cas_login')), name="remie_markers"),
+ url(r'^remie/workunit/teacher', login_required(RemieTeacherView.as_view(), login_url=reverse_lazy('cas_login')), name="remie_teacher"),
url(r'^/?$', RedirectView.as_view(url='ldt'), name="remie_iframe_container"),