L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-60732 core_user: Show group filters

Browse Source 
Always show the group filters, even if the course is in NO_GROUPS mode.
This commit is contained in:
Damyon Wiese
2017-11-08 16:45:42 +08:00
parent c9f995872f
commit a471bc4971
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/renderer.php
+13 -15
View File
@@ -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);