From 924a9111391c6fdb4720474348d75aeff71d66ab Mon Sep 17 00:00:00 2001 From: Victor Shnayder Date: Wed, 11 Jul 2012 16:38:53 -0400 Subject: [PATCH] formatting fixes and note about bug * don't know what the intended fix is --- lms/urls.py | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/lms/urls.py b/lms/urls.py index 328efacc13..dec0b2bcb4 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -35,13 +35,16 @@ urlpatterns = ('', url(r'^password_reset/$', 'student.views.password_reset'), ## Obsolete Django views for password resets ## TODO: Replace with Mako-ized views - url(r'^password_change/$',django.contrib.auth.views.password_change,name='auth_password_change'), - url(r'^password_change_done/$',django.contrib.auth.views.password_change_done,name='auth_password_change_done'), - url(r'^password_reset_confirm/(?P[0-9A-Za-z]+)-(?P.+)/$',django.contrib.auth.views.password_reset_confirm, + url(r'^password_change/$', django.contrib.auth.views.password_change, + name='auth_password_change'), + url(r'^password_change_done/$', django.contrib.auth.views.password_change_done, + name='auth_password_change_done'), + url(r'^password_reset_confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', + django.contrib.auth.views.password_reset_confirm, name='auth_password_reset_confirm'), - url(r'^password_reset_complete/$',django.contrib.auth.views.password_reset_complete, + url(r'^password_reset_complete/$', django.contrib.auth.views.password_reset_complete, name='auth_password_reset_complete'), - url(r'^password_reset_done/$',django.contrib.auth.views.password_reset_done, + url(r'^password_reset_done/$', django.contrib.auth.views.password_reset_done, name='auth_password_reset_done'), ## Feedback url(r'^send_feedback$', 'util.views.send_feedback'), @@ -69,15 +72,25 @@ if settings.COURSEWARE_ENABLED: # Multicourse related: url(r'^courses/?$', 'courseware.views.courses', name="courses"), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/info$', 'courseware.views.course_info', name="info"), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/book$', 'staticbook.views.index', name="book"), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/enroll$', 'student.views.enroll', name="enroll"), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/courseware/?$', 'courseware.views.index', name="courseware"), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/courseware/(?P[^/]*)/(?P
[^/]*)/$', 'courseware.views.index', name="courseware_section"), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/profile$', 'courseware.views.profile', name="profile"), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/profile/(?P[^/]*)/$', 'courseware.views.profile'), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/info$', + 'courseware.views.course_info', name="info"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/book$', + 'staticbook.views.index', name="book"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/enroll$', + 'student.views.enroll', name="enroll"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/courseware/?$', + 'courseware.views.index', name="courseware"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/courseware/(?P[^/]*)/(?P
[^/]*)/$', + 'courseware.views.index', name="courseware_section"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/profile$', + 'courseware.views.profile', name="profile"), + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/profile/(?P[^/]*)/$', + 'courseware.views.profile'), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/about$', 'student.views.course_info', name="about_course"), + # TODO (vshnayder): there is no student.views.course_info. + # Where should this point instead? same as the info view? + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/about$', + 'student.views.course_info', name="about_course"), ) # Multicourse wiki