Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint

Browse Source
This commit is contained in:
Chris Dodge
2012-11-09 09:37:21 -05:00
parent 3774c95b5e 48093da589
commit da8efc17de
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cms/djangoapps/contentstore/views.py
View File

@@ -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())

2
common/lib/xmodule/xmodule/modulestore/xml_importer.py
View File

@@ -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: