Commit dcc53c2b by John Jarvis

Fixing namespace issue for "login"

* renaming login to login_user
* renaming register to register_user
parent 80bcf060
...@@ -204,14 +204,14 @@ def _cert_info(user, course, cert_status): ...@@ -204,14 +204,14 @@ def _cert_info(user, course, cert_status):
return d return d
def login(request): def login_user(request):
""" """
This view will display the non-modal login form This view will display the non-modal login form
""" """
context = {} context = {}
return render_to_response('login.html', context) return render_to_response('login.html', context)
def register(request): def register_user(request):
""" """
This view will display the non-modal registration form This view will display the non-modal registration form
""" """
......
...@@ -15,8 +15,8 @@ urlpatterns = ('', ...@@ -15,8 +15,8 @@ urlpatterns = ('',
url(r'^update_certificate$', 'certificates.views.update_certificate'), url(r'^update_certificate$', 'certificates.views.update_certificate'),
url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware
url(r'^dashboard$', 'student.views.dashboard', name="dashboard"), url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
url(r'^signin$', 'student.views.login', name="login"), url(r'^signin$', 'student.views.login_user', name="login_user"),
url(r'^register$', 'student.views.register', name="register"), url(r'^register$', 'student.views.register_user', name="register_user"),
url(r'^admin_dashboard$', 'dashboard.views.dashboard'), url(r'^admin_dashboard$', 'dashboard.views.dashboard'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment