MDL-13579 Corrected a bug in default value selection for the grader r…

…eport preferences form. Merging from MOODLE_19_STABLE
safatshahin · Feb 27, 2008 · 05766b5 · 05766b5
1 parent 73c32e8
commit 05766b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -114,7 +114,7 @@ function grade_report_grader($courseid, $gpr, $context, $page=null, $sortitemid=
 
         // 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
@@ -153,8 +153,14 @@ function definition() {
                     $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 {