From 1d3f8f0655755175f3de07a9249f5d81e6838ee0 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Tue, 5 Feb 2013 16:54:57 -0500 Subject: [PATCH] Pass display name and content link rewriting down the chain --- common/lib/xmodule/xmodule/combined_open_ended_module.py | 6 +++++- common/lib/xmodule/xmodule/combined_open_ended_modulev1.py | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py index 60d6d95290..3e0a3b27a5 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_module.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py @@ -137,10 +137,14 @@ class CombinedOpenEndedModule(XModule): self.version = DEFAULT_VERSION version_index = versions.index(self.version) + static_data = { + 'rewrite_content_links' : self.rewrite_content_links, + } + self.child_descriptor = descriptors[version_index](self.system) self.child_definition = CombinedOpenEndedV1Descriptor.definition_from_xml(etree.fromstring(definition['xml_string']), self.system) self.child_module = modules[version_index](self.system, location, self.child_definition, self.child_descriptor, - instance_state = json.dumps(instance_state), metadata = self.metadata) + instance_state = json.dumps(instance_state), metadata = self.metadata, static_data= static_data) def get_html(self): return self.child_module.get_html() diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py index ca129215e3..e21765f76b 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py @@ -98,7 +98,7 @@ class CombinedOpenEndedV1Module(): css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]} def __init__(self, system, location, definition, descriptor, - instance_state=None, shared_state=None, metadata = None, **kwargs): + instance_state=None, shared_state=None, metadata = None, static_data = None, **kwargs): """ Definition file should have one or many task blocks, a rubric block, and a prompt block: @@ -136,7 +136,9 @@ class CombinedOpenEndedV1Module(): """ self.metadata = metadata - self.display_name = metadata['display_name'] + self.display_name = metadata.get('display_name', "Open Ended") + self.rewrite_content_links = static_data['rewrite_content_links'] + # Load instance state if instance_state is not None: @@ -188,6 +190,7 @@ class CombinedOpenEndedV1Module(): } self.task_xml = definition['task_xml'] + self.location = location self.setup_next_task() def get_tag_name(self, xml):