From 1ecfac3f844d73758c39f09d46823540b9346c2a Mon Sep 17 00:00:00 2001 From: Usman Khalid <2200617@gmail.com> Date: Thu, 22 May 2014 20:54:00 +0500 Subject: [PATCH] Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. LMS-2738 --- common/djangoapps/course_modes/urls.py | 2 +- lms/djangoapps/courseware/features/certificates.py | 2 +- lms/djangoapps/verify_student/urls.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/djangoapps/course_modes/urls.py b/common/djangoapps/course_modes/urls.py index 47e7f04c40..917f97ff31 100644 --- a/common/djangoapps/course_modes/urls.py +++ b/common/djangoapps/course_modes/urls.py @@ -5,5 +5,5 @@ from course_modes import views urlpatterns = patterns( '', - url(r'^choose/(?P[^/]+/[^/]+/[^/]+)$', views.ChooseModeView.as_view(), name="course_modes_choose"), + url(r'^choose/(?P[^/]+/[^/]+/[^/]+)/$', views.ChooseModeView.as_view(), name="course_modes_choose"), ) diff --git a/lms/djangoapps/courseware/features/certificates.py b/lms/djangoapps/courseware/features/certificates.py index 06d77e8008..25d7bf9b0c 100644 --- a/lms/djangoapps/courseware/features/certificates.py +++ b/lms/djangoapps/courseware/features/certificates.py @@ -281,7 +281,7 @@ def see_that_i_am_on_the_verified_track(step): @step(u'I leave the flow and return$') def leave_the_flow_and_return(step): - world.visit('verify_student/verified/edx/999/Certificates') + world.visit('verify_student/verified/edx/999/Certificates/') @step(u'I am at the verified page$') diff --git a/lms/djangoapps/verify_student/urls.py b/lms/djangoapps/verify_student/urls.py index ee52a03720..22f779fcd7 100644 --- a/lms/djangoapps/verify_student/urls.py +++ b/lms/djangoapps/verify_student/urls.py @@ -5,19 +5,19 @@ from verify_student import views urlpatterns = patterns( '', url( - r'^show_requirements/(?P[^/]+/[^/]+/[^/]+)$', + r'^show_requirements/(?P[^/]+/[^/]+/[^/]+)/$', views.show_requirements, name="verify_student_show_requirements" ), url( - r'^verify/(?P[^/]+/[^/]+/[^/]+)$', + r'^verify/(?P[^/]+/[^/]+/[^/]+)/$', views.VerifyView.as_view(), # pylint: disable=E1120 name="verify_student_verify" ), url( - r'^verified/(?P[^/]+/[^/]+/[^/]+)$', + r'^verified/(?P[^/]+/[^/]+/[^/]+)/$', views.VerifiedView.as_view(), name="verify_student_verified" ), @@ -41,7 +41,7 @@ urlpatterns = patterns( ), url( - r'^midcourse_reverify/(?P[^/]+/[^/]+/[^/]+)$', + r'^midcourse_reverify/(?P[^/]+/[^/]+/[^/]+)/$', views.MidCourseReverifyView.as_view(), # pylint: disable=E1120 name="verify_student_midcourse_reverify" ),