From 6ab7afac4ab64e91656777dc7e6d59aa00441894 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 18 Jan 2013 16:37:47 -0500 Subject: [PATCH 1/2] One more merge fix --- common/lib/xmodule/xmodule/open_ended_module.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py index 799e0ca29e..47e892c191 100644 --- a/common/lib/xmodule/xmodule/open_ended_module.py +++ b/common/lib/xmodule/xmodule/open_ended_module.py @@ -381,12 +381,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild): rubric_feedback="" feedback = self._convert_longform_feedback_to_html(response_items) if response_items['rubric_scores_complete']==True: -<<<<<<< HEAD - rubric_renderer = CombinedOpenEndedRubric(True) + rubric_renderer = CombinedOpenEndedRubric(system, True) success, rubric_feedback = rubric_renderer.render_rubric(response_items['rubric_xml']) -======= - rubric_feedback = CombinedOpenEndedRubric.render_rubric(response_items['rubric_xml'], system) ->>>>>>> master if not response_items['success']: return system.render_template("open_ended_error.html", From ef53bab5dddbabcd7263e43fa65c5a21e10e17b0 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 18 Jan 2013 16:41:00 -0500 Subject: [PATCH 2/2] One more fix --- common/lib/xmodule/xmodule/combined_open_ended_rubric.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py index 07844aec35..e0e6b33826 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py @@ -8,7 +8,7 @@ class CombinedOpenEndedRubric(object): def __init__ (self, system, view_only = False): self.has_score = False self.view_only = view_only - self.system + self.system = system ''' render_rubric: takes in an xml string and outputs the corresponding