From a471bc49711b239d052c30ebd3fefc10fc2d31e2 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 8 Nov 2017 13:41:49 +0800
Subject: [PATCH] MDL-60732 core_user: Show group filters

Always show the group filters, even if the course is in NO_GROUPS mode.
---
 user/renderer.php | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/user/renderer.php b/user/renderer.php
index eb2026ec1ab..2fc98e33ca1 100644
--- a/user/renderer.php
+++ b/user/renderer.php
@@ -121,6 +121,7 @@ class core_user_renderer extends plugin_renderer_base {
         global $CFG, $DB, $USER;
 
         require_once($CFG->dirroot . '/enrol/locallib.php');
+        require_once($CFG->dirroot . '/lib/grouplib.php');
         $manager = new course_enrolment_manager($this->page, $course);
 
         $filteroptions = [];
@@ -135,21 +136,19 @@ class core_user_renderer extends plugin_renderer_base {
         $filteroptions += $roleoptions;
 
         // Filter options for groups, if available.
-        if ($course->groupmode != NOGROUPS) {
-            if (has_capability('moodle/site:accessallgroups', $context) || $course->groupmode == VISIBLEGROUPS) {
-                // List all groups if the user can access all groups, or we are in visible group mode.
-                $groups = $manager->get_all_groups();
-            } else {
-                // Otherwise, just list the groups the user belongs to.
-                $groups = groups_get_all_groups($course->id, $USER->id);
-            }
-            $criteria = get_string('group');
-            $groupoptions = [];
-            foreach ($groups as $id => $group) {
-                $groupoptions += $this->format_filter_option(USER_FILTER_GROUP, $criteria, $id, $group->name);
-            }
-            $filteroptions += $groupoptions;
+        if (has_capability('moodle/site:accessallgroups', $context) || $course->groupmode != SEPARATEGROUPS) {
+            // List all groups if the user can access all groups, or we are in visible group mode or no groups mode.
+            $groups = $manager->get_all_groups();
+        } else {
+            // Otherwise, just list the groups the user belongs to.
+            $groups = groups_get_all_groups($course->id, $USER->id);
         }
+        $criteria = get_string('group');
+        $groupoptions = [];
+        foreach ($groups as $id => $group) {
+            $groupoptions += $this->format_filter_option(USER_FILTER_GROUP, $criteria, $id, $group->name);
+        }
+        $filteroptions += $groupoptions;
 
         $canreviewenrol = has_capability('moodle/course:enrolreview', $context);
 
@@ -238,7 +237,6 @@ class core_user_renderer extends plugin_renderer_base {
             }
         }
 
-
         $indexpage = new \core_user\output\unified_filter($filteroptions, $filtersapplied);
         $context = $indexpage->export_for_template($this->output);