MDL-48655 gradebook: Don't treat a scale with a gradepass of 0 as passed

This commit is contained in:
Eric Merrill
2014-12-18 16:18:40 -05:00
parent 7e58ab50a4
commit ab391cddf0
+6 -2
View File
@@ -818,8 +818,12 @@ class grade_grade extends grade_object {
return null;
}
// Return null if gradepass == grademin or gradepass is null
if (is_null($this->grade_item->gradepass) || $this->grade_item->gradepass == $this->grade_item->grademin) {
// Return null if gradepass == grademin, gradepass is null, or grade item is a scale and gradepass is 0.
if (is_null($this->grade_item->gradepass)) {
return null;
} else if ($this->grade_item->gradepass == $this->grade_item->grademin) {
return null;
} else if ($this->grade_item->gradetype == GRADE_TYPE_SCALE && !grade_floats_different($this->grade_item->gradepass, 0.0)) {
return null;
}