From a3bf3fb1ca34e454f51e093126271296e5cae075 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Fri, 21 Sep 2012 15:49:07 -0400 Subject: [PATCH] Put SequenceDescriptor back as a subclass of MakeModuleDescriptor. THe previous change to have it derive from EditorDescriptor was not safe as EditorDescriptor presumes that there is a edit box in the JS save flows. So we need to edit get_context() on MakoModuleDescriptor to also pass along the metadata to the Mako rendering templates --- common/lib/xmodule/xmodule/mako_module.py | 4 +++- common/lib/xmodule/xmodule/seq_module.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/mako_module.py b/common/lib/xmodule/xmodule/mako_module.py index eedac99aa8..87c2c7d5f9 100644 --- a/common/lib/xmodule/xmodule/mako_module.py +++ b/common/lib/xmodule/xmodule/mako_module.py @@ -31,7 +31,9 @@ class MakoModuleDescriptor(XModuleDescriptor): """ Return the context to render the mako template with """ - return {'module': self} + return {'module': self, + 'metadata': self.metadata + } def get_html(self): return self.system.render_template( diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py index 0e0fd10fa4..8592d4b38c 100644 --- a/common/lib/xmodule/xmodule/seq_module.py +++ b/common/lib/xmodule/xmodule/seq_module.py @@ -112,7 +112,7 @@ class SequenceModule(XModule): return new_class -class SequenceDescriptor(EditingDescriptor, XmlDescriptor): +class SequenceDescriptor(MakoModuleDescriptor, XmlDescriptor): mako_template = 'widgets/sequence-edit.html' module_class = SequenceModule