MDL-17226 reverted incorrect fix

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index bcc868305dbd655614c90d263e4575e0d43781a5..b7246054d4a2203c8c87460a202b2c2c7fc17cf8 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -427,7 +427,7 @@ class grade_report_grader extends grade_report {
 
         if (has_capability('moodle/grade:viewall', $this->context)
          and has_capability('moodle/site:accessallgroups', $this->context)
-         and $COURSE->groupmode != NOGROUPS) { // TODO replace that last condition with proper check
+         and ($course_has_groups = true)) { // TODO replace that last condition with proper check
             $html .= $this->print_toggle('groups', true);
         }
 

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index 60c229e7a4c220c6da1a0564128e36dc35344ea6..f6ee6b1e7f47f94f6b3446f406f1f2db84796cb6 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -72,10 +72,7 @@ class grader_report_preferences_form extends moodleform {
             if ($canviewhidden) {
                 $preferences['prefshow']['showaverages']  = $checkbox_default;
             }
-            if ($course->groupmode != NOGROUPS) {
-                $preferences['prefshow']['showgroups']        = $checkbox_default;
-            }
-
+            $preferences['prefshow']['showgroups']        = $checkbox_default;
             $preferences['prefshow']['showlocks']         = $checkbox_default;
 
             $preferences['prefrows'] = array(