Merge pull request #6950 from edx/release

Release
2015-02-10 16:06:24 -05:00
parent 5ccf6d53e1 f3f6aef94f
commit 296167e531
10 changed files with 127 additions and 20 deletions
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -185,7 +185,8 @@ def _preview_module_system(request, descriptor, field_data):
        wrappers=wrappers,
        error_descriptor_class=ErrorDescriptor,
        get_user_role=lambda: get_user_role(request.user, course_id),
-        descriptor_runtime=descriptor.runtime,
+        # Get the raw DescriptorSystem, not the CombinedSystem
+        descriptor_runtime=descriptor._runtime,  # pylint: disable=protected-access
        services={
            "i18n": ModuleI18nService(),
            "field-data": field_data,