From c6c3e4b9d31a4b338d13131ac073a6fafda8617c Mon Sep 17 00:00:00 2001 From: ihoover Date: Tue, 23 Jul 2013 16:23:54 -0400 Subject: [PATCH] working under cms too --- cms/urls.py | 6 ++++++ lms/urls.py | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cms/urls.py b/cms/urls.py index 711742d89f..55b8d87c2a 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -149,6 +149,12 @@ if settings.MITX_FEATURES.get('ENABLE_SERVICE_STATUS'): urlpatterns += (url(r'^admin/', include(admin.site.urls)),) +# enable automatic login +if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING'): + urlpatterns += ( + url(r'^auto_auth$', 'student.views.auto_auth'), + ) + urlpatterns = patterns(*urlpatterns) # Custom error pages diff --git a/lms/urls.py b/lms/urls.py index c43c85aaa1..35aff1481c 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -434,17 +434,17 @@ if settings.MITX_FEATURES.get('ENABLE_HINTER_INSTRUCTOR_VIEW'): 'instructor.hint_manager.hint_manager', name="hint_manager"), ) -urlpatterns = patterns(*urlpatterns) - -if settings.DEBUG: - urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) - # enable automatic login if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING'): urlpatterns += ( url(r'^auto_auth$', 'student.views.auto_auth'), ) +urlpatterns = patterns(*urlpatterns) + +if settings.DEBUG: + urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + #Custom error pages handler404 = 'static_template_view.views.render_404' handler500 = 'static_template_view.views.render_500'