From 7567e5ebf9a49ebfbdb5a9e7b8f409afae170811 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Fri, 1 Jun 2012 10:29:12 -0400 Subject: [PATCH] Working snapshot. Simple get_children. get_module taken out of render_module. --- djangoapps/courseware/module_render.py | 5 +++-- djangoapps/courseware/modules/seq_module.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/djangoapps/courseware/module_render.py b/djangoapps/courseware/module_render.py index e9303bb18b..26948023dd 100644 --- a/djangoapps/courseware/module_render.py +++ b/djangoapps/courseware/module_render.py @@ -18,6 +18,7 @@ from models import StudentModule from multicourse import multicourse_settings import courseware.modules +import courseware.content_parser as content_parser log = logging.getLogger("mitx.courseware") @@ -128,14 +129,14 @@ def get_module(user, request, xml_module, module_object_preload): smod.save() module_object_preload.append(smod) - return (instance, smod) + return (instance, smod, module_type) def render_x_module(user, request, xml_module, module_object_preload): ''' Generic module for extensions. This renders to HTML. ''' if xml_module==None : return {"content":""} - (instance, smod) = get_module(user, request, xml_module, module_object_preload) + (instance, smod, module_type) = get_module(user, request, xml_module, module_object_preload) # Grab content content = instance.get_html() diff --git a/djangoapps/courseware/modules/seq_module.py b/djangoapps/courseware/modules/seq_module.py index f8ab6b9166..8726df2e41 100644 --- a/djangoapps/courseware/modules/seq_module.py +++ b/djangoapps/courseware/modules/seq_module.py @@ -58,6 +58,7 @@ class Module(XModule): for e in self.xmltree] self.contents = self.rendered_children() + self.contents = [j(m) for m in self.contents] for contents, title in zip(self.contents, titles): contents['title'] = title