From dcc53c2bcdf70e734cfe6065f5c8420fd3f9889e Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 23 Jan 2013 17:53:23 -0500 Subject: [PATCH] Fixing namespace issue for "login" * renaming login to login_user * renaming register to register_user --- common/djangoapps/student/views.py | 4 ++-- lms/urls.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 071a41a834..1f711e146a 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -204,14 +204,14 @@ def _cert_info(user, course, cert_status): return d -def login(request): +def login_user(request): """ This view will display the non-modal login form """ context = {} return render_to_response('login.html', context) -def register(request): +def register_user(request): """ This view will display the non-modal registration form """ diff --git a/lms/urls.py b/lms/urls.py index fa39c56cef..a2c02ef2de 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -15,8 +15,8 @@ urlpatterns = ('', url(r'^update_certificate$', 'certificates.views.update_certificate'), url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware url(r'^dashboard$', 'student.views.dashboard', name="dashboard"), - url(r'^signin$', 'student.views.login', name="login"), - url(r'^register$', 'student.views.register', name="register"), + url(r'^signin$', 'student.views.login_user', name="login_user"), + url(r'^register$', 'student.views.register_user', name="register_user"), url(r'^admin_dashboard$', 'dashboard.views.dashboard'),