gradebook not correctly remembering pass/fail grades

For pass/fail assignments the gradebook was not properly remembering the set value if you clicked the word bubble to add comments to the submission from within the gradebook. This should be fixed. fixes #4002 Change-Id: I29837e3063e365d9aa1b80f9f0062748a4b73fb7 Reviewed-on: https://gerrit.instructure.com/2740 Tested-by: Hudson <[email protected]> Reviewed-by: Zach Wily <[email protected]>
cybercent · Mar 25, 2011 · e4169cd · e4169cd
1 parent 78eeabe
commit e4169cd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/public/javascripts/gradebooks.js b/public/javascripts/gradebooks.js
@@ -1251,8 +1251,6 @@ var gradebook = (function(){
     if(submission.grade !== "" && submission.grade == 0) {
       submission.grade = "0";
     }
-    if(submission.grade && submission.grade.toString() == Math.round(submission.grade).toString()) {
-    }
     var $submission_score = $submission.find(".score"),
         $submission_pending_review = $submission.find(".pending_review"),
         $submission_turnitin = $submission.find(".turnitin"),
@@ -1399,9 +1397,12 @@ var gradebook = (function(){
     }
     if(grade == "_" || grade == "-") { grade = ""; }
 
-    if($grade_entry[0].tagName != "SELECT" || grade != "") {
+    if($grade_entry[0].tagName == "SELECT") {
+      $grade_entry.val(submission.grade);
+    } else if(grade != "") {
       $grade_entry.val(grade);
     }
+
     url = $.replaceTags(url, 'assignment_id', submission.assignment_id);
     url = $.replaceTags(url, 'user_id', submission.user_id);
     $view.append($("#submission_view_image").clone(true).removeAttr('id'));