From 0b7af27b4b36f5912e240d3ef6fa0bfd4557e140 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Tue, 7 May 2013 16:00:00 -0400 Subject: [PATCH] be more forgiving about the iframe url If anything after mktg/ does not parse as a course-id return "coming soon" This will prevent 404 errors when urls are incorrect on the marketing site. --- lms/djangoapps/courseware/views.py | 2 +- lms/urls.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index ad6ca665a0..1f1f47adef 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -537,7 +537,7 @@ def mktg_course_about(request, course_id): try: course = get_course_with_access(request.user, course_id, 'see_exists') - except Http404 as e: + except (ValueError, Http404) as e: # if a course does not exist yet, display a coming # soon button return render_to_response('courseware/mktg_coming_soon.html', diff --git a/lms/urls.py b/lms/urls.py index f32c4fc128..2573719332 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -185,9 +185,13 @@ if settings.COURSEWARE_ENABLED: #About the course url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/about$', 'courseware.views.course_about', name="about_course"), - #View for mktg site + #View for mktg site (kept for backwards compatibility TODO - remove before merge to master) url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/mktg-about$', 'courseware.views.mktg_course_about', name="mktg_about_course"), + #View for mktg site + url(r'^mktg/(?P.*)$', + 'courseware.views.mktg_course_about', name="mktg_about_course"), + #Inside the course