Convert to passing in current task state again

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -273,7 +273,7 @@ class CombinedOpenEndedV1Module():
                 })
             self.current_task = child_task_module(self.system, self.location,
                 self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
-                instance_state=self.instance_state, model_data = self._model_data, task_number = self.current_task_number)
+                instance_state=current_task_state)
             self.task_states.append(self.current_task.get_instance_state())
             self.state = self.ASSESSING
         else:
@@ -281,7 +281,7 @@ class CombinedOpenEndedV1Module():
                 current_task_state = self.overwrite_state(current_task_state)
             self.current_task = child_task_module(self.system, self.location,
                 self.current_task_parsed_xml, self.current_task_descriptor, self.static_data,
-                instance_state=self.instance_state, model_data = self._model_data, task_number = self.current_task_number)
+                instance_state=current_task_state)
 
         return True
 

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -102,6 +102,7 @@ class OpenEndedChild(object):
         except:
             self.child_attempts = 0
 
+        self.max_attempts = static_data['max_attempts']
         self.child_prompt = static_data['prompt']
         self.child_rubric = static_data['rubric']
         self.display_name = static_data['display_name']
@@ -277,7 +278,7 @@ class OpenEndedChild(object):
                 return Progress(self.get_score()['score'], self._max_score)
             except Exception as err:
                 #This is a dev_facing_error
-                log.exception("Got bad progress from open ended child module. Max Score: {1}".format(self._max_score))
+                log.exception("Got bad progress from open ended child module. Max Score: {0}".format(self._max_score))
                 return None
         return None