Skip to content

E
edx-platform
Commit 6ab7afac by Diana Huang
Options

One more merge fix

parent dd20226e
Showing with 1 additions and 5 deletions
common/lib/xmodule/xmodule/open_ended_module.py
...@@ -381,12 +381,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -381,12 +381,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
rubric_feedback="" rubric_feedback=""
feedback = self._convert_longform_feedback_to_html(response_items) feedback = self._convert_longform_feedback_to_html(response_items)
if response_items['rubric_scores_complete']==True: if response_items['rubric_scores_complete']==True:
<<<<<<< HEAD rubric_renderer = CombinedOpenEndedRubric(system, True)
rubric_renderer = CombinedOpenEndedRubric(True)
success, rubric_feedback = rubric_renderer.render_rubric(response_items['rubric_xml']) 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']: if not response_items['success']:
return system.render_template("open_ended_error.html", return system.render_template("open_ended_error.html",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment