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

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

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: