Minor fixes

common/lib/xmodule/xmodule/peer_grading_module.py

@@ -392,8 +392,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
         # if we can't parse the rubric into HTML,
         except etree.XMLSyntaxError:
             #This is a dev_facing_error
-            log.exception("Cannot parse rubric string. Raw string: {0}"
-            .format(""))
+            log.exception("Cannot parse rubric string.")
             #This is a student_facing_error
             return {'success': False,
                     'error': 'Error displaying submission.  Please notify course staff.'}
@@ -440,7 +439,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
         except GradingServiceError:
             #This is a dev_facing_error
             log.exception(
-                "Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(
+                "Error saving calibration grade, location: {0}, submission_key: {1}, grader_id: {2}".format(
                     location, submission_key, grader_id))
             #This is a student_facing_error
             return self._err_response('There was an error saving your score.  Please notify course staff.')

lms/djangoapps/open_ended_grading/staff_grading_service.py

@@ -313,6 +313,8 @@ def save_grade(request, course_id):
     p = request.POST
     required = set(['score', 'feedback', 'submission_id', 'location', 'submission_flagged'])
     skipped = 'skipped' in p
+    #If the instructor has skipped grading the submission, then there will not be any rubric scores.
+    #Only add in the rubric scores if the instructor has not skipped.
     if not skipped:
         required|=set(['rubric_scores[]'])
     actual = set(p.keys())

lms/templates/peer_grading/peer_grading_problem.html

@@ -86,7 +86,7 @@
     <section class="flag-submission-confirmation">
         <h4> Are you sure that you want to flag this submission?</h4>
         <p>
-        Please only flag explicit or pornographic content.  Click the button below if you understand this and still want to flag the submission.
+        You are about to flag a submission. You should only flag a submission that contains explicit or offensive content. If the submission is not addressed to the question or is incorrect, you should give it a score of zero and accompanying feedback instead of flagging it.
         </p>
         <div>
         <input type="button" class="flag-submission-removal-button" value="Remove Flag" name="calibration-interstitial-page-button" />