Commit 0b7af27b by John Jarvis

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.
parent f7f791ab
...@@ -537,7 +537,7 @@ def mktg_course_about(request, course_id): ...@@ -537,7 +537,7 @@ def mktg_course_about(request, course_id):
try: try:
course = get_course_with_access(request.user, course_id, 'see_exists') 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 # if a course does not exist yet, display a coming
# soon button # soon button
return render_to_response('courseware/mktg_coming_soon.html', return render_to_response('courseware/mktg_coming_soon.html',
......
...@@ -185,9 +185,13 @@ if settings.COURSEWARE_ENABLED: ...@@ -185,9 +185,13 @@ if settings.COURSEWARE_ENABLED:
#About the course #About the course
url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/about$', url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/about$',
'courseware.views.course_about', name="about_course"), '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$', url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/mktg-about$',
'courseware.views.mktg_course_about', name="mktg_about_course"), '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 #Inside the course
......
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