diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index ad6ca665a0468427e767644349f88120dfec2415..1f1f47adefcb1790287dfe105307e877e2ec62c7 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 f32c4fc128080d3e0635d54029a75015b53ced2e..257371933256d2bccdb8cc4a70b18b44f9ccd04c 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -185,9 +185,13 @@ if settings.COURSEWARE_ENABLED: #About the course url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/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<course_id>[^/]+/[^/]+/[^/]+)/mktg-about$', 'courseware.views.mktg_course_about', name="mktg_about_course"), + #View for mktg site + url(r'^mktg/(?P<course_id>.*)$', + 'courseware.views.mktg_course_about', name="mktg_about_course"), + #Inside the course