From 3e64faeaa30c0badc44862c2d35942ac86843751 Mon Sep 17 00:00:00 2001 From: Waheed Ahmed Date: Thu, 18 Sep 2014 17:12:48 +0500 Subject: [PATCH] Fixed wiki merge url regex. TNL-413 --- lms/envs/common.py | 1 + lms/urls.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index b331e39340..52e202eb05 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -469,6 +469,7 @@ LMS_MIGRATION_ALLOWED_IPS = [] # too many inadvertent side effects :-( COURSE_KEY_PATTERN = r'(?P[^/+]+(/|\+)[^/+]+(/|\+)[^/]+)' COURSE_ID_PATTERN = COURSE_KEY_PATTERN.replace('course_key_string', 'course_id') +COURSE_KEY_REGEX = COURSE_KEY_PATTERN.replace('P', ':') USAGE_KEY_PATTERN = r'(?P(?:i4x://?[^/]+/[^/]+/[^/]+/[^@]+(?:@[^/]+)?)|(?:[^/]+))' ASSET_KEY_PATTERN = r'(?P(?:/?c4x(:/)?/[^/]+/[^/]+/[^/]+/[^@]+(?:@[^/]+)?)|(?:[^/]+))' diff --git a/lms/urls.py b/lms/urls.py index f8009960d0..9804d8e9f5 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -188,7 +188,7 @@ if settings.WIKI_ENABLED: # never be returned by a reverse() so they come after the other url patterns url(r'^courses/{}/course_wiki/?$'.format(settings.COURSE_ID_PATTERN), 'course_wiki.views.course_wiki_redirect', name="course_wiki"), - url(r'^courses/{}/wiki/'.format(settings.COURSE_ID_PATTERN), include(wiki_pattern())), + url(r'^courses/{}/wiki/'.format(settings.COURSE_KEY_REGEX), include(wiki_pattern())), ) if settings.COURSEWARE_ENABLED: