Some fixes to make preferences work correctly (if not set then they a…

…re 0) and so now ranges and averages show correctly on grader report when these are set to defaults in preferences MDL-11618
moodle · Oct 8, 2007 · 4354a3e · 4354a3e
1 parent 323ccc2
commit 4354a3e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -908,7 +908,8 @@ function get_avghtml($grouponly=false) {
                     $displaytype = GRADE_DISPLAY_TYPE_REAL;
 
                 } else if ($averagesdisplaytype == GRADE_REPORT_PREFERENCE_DEFAULT 
-                        or $averagesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) {
+                        || $averagesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT
+                        || $averagesdisplaytype == 0) {
                     $displaytype = $item->get_displaytype();
 
                 } else {
@@ -917,7 +918,7 @@ function get_avghtml($grouponly=false) {
 
                 // Override grade_item setting if a display preference (not inherit) was set for the averages
                 if ($averagesdecimalpoints == GRADE_REPORT_PREFERENCE_DEFAULT 
-                 or $averagesdecimalpoints == GRADE_REPORT_PREFERENCE_INHERIT) {
+                 || $averagesdecimalpoints == GRADE_REPORT_PREFERENCE_INHERIT) {
                     $decimalpoints = $item->get_decimals();
 
                 } else {
@@ -967,7 +968,8 @@ function get_rangehtml() {
                     $displaytype = GRADE_DISPLAY_TYPE_REAL;
 
                 } else if ($rangesdisplaytype == GRADE_REPORT_PREFERENCE_DEFAULT 
-                        or $rangesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT) {
+                        || $rangesdisplaytype == GRADE_REPORT_PREFERENCE_INHERIT
+                        || $rangesdisplaytype == 0 ) {
                     $displaytype = $item->get_displaytype();
 
                 } else {