MDL-13579 Corrected a bug in default value selection for the grader report preference...

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 30de950d5fe2bdb65a78ca6abb99f1cbcea88aa2..9d18e10afeb72d1fb9a099ef6a1f559719279610 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -114,7 +114,7 @@ class grade_report_grader extends grade_report {
 
         // if user report preference set or site report setting set use it, otherwise use course or site setting
         $switch = $this->get_pref('aggregationposition');
-        if (empty($switch)) {
+        if ($switch == '') {
             $switch = grade_get_setting($this->courseid, 'aggregationposition', $CFG->grade_aggregationposition);
         }
 

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index 797c9781fb1b9cce00077e6522e23e79370e19ec..5c5df2711fc151edb0f33430fa5716de56330e1b 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -153,8 +153,14 @@ class grader_report_preferences_form extends moodleform {
                     $type = 'select';
                     // MDL-11478
                     // get default aggregationposition from grade_settings
+                    $course_value = grade_get_setting($course->id, $pref, $CFG->{$full_pref});
+                    
                     if ($pref == 'aggregationposition') {
-                        $default = $options[grade_get_setting($course->id, $pref, $CFG->{$full_pref})];
+                        if (!empty($options[$course_value])) {
+                            $default = $options[$course_value];
+                        } else {
+                            $default = $options[$CFG->grade_aggregationposition];
+                        }
                     } elseif (isset($options[$CFG->{$full_pref}])) {
                         $default = $options[$CFG->{$full_pref}];
                     } else {