Merge branch 'MDL-32076_unlimited2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

2013-02-12 14:42:43 +08:00
parent 0225b635c4 cd536c6be5
commit 35f7e66ed7
2 changed files with 8 additions and 5 deletions
@@ -81,10 +81,13 @@ switch ($action) {
                // Warn if the grade is out of bounds.
                if (is_null($finalgrade)) {
                    // ok
-                } else if ($finalgrade < $grade_item->grademin) {
-                    $errorstr = 'lessthanmin';
-                } else if ($finalgrade > $grade_item->grademax) {
-                    $errorstr = 'morethanmax';
+                } else {
+                    $bounded = $grade_item->bounded_grade($finalgrade);
+                    if ($bounded > $finalgrade) {
+                        $errorstr = 'lessthanmin';
+                    } else if ($bounded < $finalgrade) {
+                        $errorstr = 'morethanmax';
+                    }
                }

                if ($errorstr) {
@@ -256,7 +256,7 @@ class grade_report_grader extends grade_report {
                        } else {
                            $bounded = $gradeitem->bounded_grade($finalgrade);
                            if ($bounded > $finalgrade) {
-                            $errorstr = 'lessthanmin';
+                                $errorstr = 'lessthanmin';
                            } else if ($bounded < $finalgrade) {
                                $errorstr = 'morethanmax';
                            }