From 5a02e37cce4f380a726d62a191612be8803442bf Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Fri, 9 Nov 2012 09:11:56 -0500 Subject: [PATCH 1/2] make sure we strip away the leading '/' from the subpath for static content otherwise the naming expectations will break --- common/lib/xmodule/xmodule/modulestore/xml_importer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py index 00ddb6a948..7ecfe61814 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py +++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py @@ -16,7 +16,7 @@ def import_static_content(modules, course_loc, course_data_path, static_content_ remap_dict = {} # now import all static assets - static_dir = course_data_path / 'static' + static_dir = course_data_path / 'static/' for dirname, dirnames, filenames in os.walk(static_dir): for filename in filenames: From 01889df686f4ac4a74731a4bba1ac7791ac4f8ed Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Fri, 9 Nov 2012 09:23:48 -0500 Subject: [PATCH 2/2] need to pass in course namespace when rewrite static links in the CMS --- cms/djangoapps/contentstore/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index f680dd7262..c8f8e8152d 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -503,7 +503,8 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_ ) module.get_html = replace_static_urls( module.get_html, - module.metadata.get('data_dir', module.location.course) + module.metadata.get('data_dir', module.location.course), + course_namespace = Location([module.location.tag, module.location.org, module.location.course, None, None]) ) save_preview_state(request, preview_id, descriptor.location.url(), module.get_instance_state(), module.get_shared_state())