Debug some score tuple issues

common/lib/xmodule/xmodule/combined_open_ended_modulev1.py

@@ -528,7 +528,7 @@ class CombinedOpenEndedV1Module():
         grader_types = [rd['grader_types'] for rd in all_responses]
         feedback_items = [rd['feedback_items'] for rd in all_responses]
 
-        rubric_html = self.rubric_renderer.render_combined_rubric(self.static_data['rubric'], rubric_scores,
+        rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']), rubric_scores,
             grader_types, feedback_items)
 
         context = {'results': rubric_html, 'task_number': task_number + 1, 'task_name' : response_dict['human_task']}

common/lib/xmodule/xmodule/combined_open_ended_rubric.py

@@ -157,7 +157,7 @@ class CombinedOpenEndedRubric(object):
         return {'description': description, 'options': options, 'score' : score}
 
     def render_combined_rubric(self,rubric_xml,scores,score_types,feedback_types):
-        score_tuples = CombinedOpenEndedRubric.reformat_scores_for_rendering(scores,score_types,feedback_types)
+        success, score_tuples = CombinedOpenEndedRubric.reformat_scores_for_rendering(scores,score_types,feedback_types)
         rubric_categories = self.extract_categories(rubric_xml)
         max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
         max_score = max(max_scores)