Merge branch 'feature/vik/check-if-submission-allowed' into feature/vik/oe-messages

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

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py

@@ -108,7 +108,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
 
         parsed_grader_payload.update({
-            'location': system.location.url(),
+            'location': self.location_string,
             'course_id': system.course_id,
             'prompt': prompt_string,
             'rubric': rubric_string,
@@ -138,7 +138,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         """
 
         event_info = dict()
-        event_info['problem_id'] = system.location.url()
+        event_info['problem_id'] = self.location_string
         event_info['student_id'] = system.anonymous_student_id
         event_info['survey_responses'] = get
 

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

@@ -110,7 +110,13 @@ class OpenEndedChild(object):
         self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,system)
 
         self.system = system
-        self.location = location
+        
+        self.location_string = location
+        try:
+            self.location_string = self.location_string.url()
+        except:
+            pass
+
         self.setup_response(system, location, definition, descriptor)
 
     def setup_response(self, system, location, definition, descriptor):
@@ -421,7 +427,8 @@ class OpenEndedChild(object):
         return success, string
 
     def check_if_student_can_submit(self):
-        location = self.system.location.url()
+        location = self.location_string
+
         student_id = self.system.anonymous_student_id
         success = False
         allowed_to_submit = True

common/lib/xmodule/xmodule/tests/test_self_assessment.py

@@ -67,10 +67,18 @@ class SelfAssessmentTest(unittest.TestCase):
         def get_fake_item(name):
             return responses[name]
 
+        def get_data_for_location(self,location,student):
+            return {
+            'count_graded' : 0,
+            'count_required' : 0,
+            'student_sub_count': 0,
+            }
+
         mock_query_dict = MagicMock()
         mock_query_dict.__getitem__.side_effect = get_fake_item
         mock_query_dict.getlist = get_fake_item
 
+        self.module.peer_gs.get_data_for_location = get_data_for_location
 
         self.assertEqual(self.module.get_score()['score'], 0)