Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements

lms/djangoapps/open_ended_grading/peer_grading_service.py

@@ -12,6 +12,7 @@ from grading_service import GradingServiceError
 from courseware.access import has_access
 from util.json_request import expect_json
 from xmodule.course_module import CourseDescriptor
+from student.models import unique_id_for_user
 
 log = logging.getLogger(__name__)
 
@@ -165,7 +166,7 @@ def get_next_submission(request, course_id):
     success, message = _check_required(request, required)
     if not success:
         return _err_response(message)
-    grader_id = request.user.id
+    grader_id = unique_id_for_user(request.user)
     p = request.POST
     location = p['location']
 
@@ -199,7 +200,7 @@ def save_grade(request, course_id):
     success, message = _check_required(request, required)
     if not success:
         return _err_response(message)
-    grader_id = request.user.id
+    grader_id = unique_id_for_user(request.user)
     p = request.POST
     location = p['location']
     submission_id = p['submission_id']
@@ -240,7 +241,7 @@ def is_student_calibrated(request, course_id):
     success, message = _check_required(request, required)
     if not success:
         return _err_response(message)
-    grader_id = request.user.id
+    grader_id = unique_id_for_user(request.user)
     p = request.POST
     location = p['location']
 
@@ -285,7 +286,7 @@ def show_calibration_essay(request, course_id):
     if not success:
         return _err_response(message)
 
-    grader_id = request.user.id
+    grader_id = unique_id_for_user(request.user)
     p = request.POST
     location = p['location']
     try:
@@ -321,7 +322,7 @@ def save_calibration_essay(request, course_id):
     success, message = _check_required(request, required)
     if not success:
         return _err_response(message)
-    grader_id = request.user.id
+    grader_id = unique_id_for_user(request.user)
     p = request.POST
     location = p['location']
     calibration_essay_id = p['submission_id']

lms/static/coffee/src/peer_grading/peer_grading_problem.coffee

@@ -131,7 +131,7 @@ class PeerGradingProblem
     Collapsible.setCollapsibles(@content_panel)
 
     # Set up the click event handlers
-    @action_button.click -> document.location.reload(true)
+    @action_button.click -> history.back()
     @calibration_feedback_button.click => 
       @calibration_feedback_panel.hide()
       @grading_wrapper.show()

lms/templates/peer_grading/peer_grading_problem.html

@@ -107,6 +107,6 @@
         <input type="button" class="interstitial-page-button" value="Start Grading!" name="interstitial-page-button" />
     </section>
 
-    <input type="button" value="Reload page" class="action-button" name="reload" />
+    <input type="button" value="Go Back" class="action-button" name="back" />
     </div>
 </section>