moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-60732-master' of git://github.com/damyon/moodle

Browse source
This commit is contained in:
David Monllao 2017-11-08 17:48:07 +01:00
commit ed0e2cea00
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
user/renderer.php
View file

@ -121,6 +121,7 @@ class core_user_renderer extends plugin_renderer_base {
global $CFG, $DB, $USER; global $CFG, $DB, $USER;
require_once($CFG->dirroot . '/enrol/locallib.php'); require_once($CFG->dirroot . '/enrol/locallib.php');
require_once($CFG->dirroot . '/lib/grouplib.php');
$manager = new course_enrolment_manager($this->page, $course); $manager = new course_enrolment_manager($this->page, $course);
$filteroptions = []; $filteroptions = [];
@ -135,9 +136,8 @@ class core_user_renderer extends plugin_renderer_base {
$filteroptions += $roleoptions; $filteroptions += $roleoptions;
// Filter options for groups, if available. // Filter options for groups, if available.
if ($course->groupmode != NOGROUPS) { if (has_capability('moodle/site:accessallgroups', $context) || $course->groupmode != SEPARATEGROUPS) {
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 or no groups mode.
// List all groups if the user can access all groups, or we are in visible group mode.
$groups = $manager->get_all_groups(); $groups = $manager->get_all_groups();
} else { } else {
// Otherwise, just list the groups the user belongs to. // Otherwise, just list the groups the user belongs to.
@ -149,7 +149,6 @@ class core_user_renderer extends plugin_renderer_base {
$groupoptions += $this->format_filter_option(USER_FILTER_GROUP, $criteria, $id, $group->name); $groupoptions += $this->format_filter_option(USER_FILTER_GROUP, $criteria, $id, $group->name);
} }
$filteroptions += $groupoptions; $filteroptions += $groupoptions;
}
$canreviewenrol = has_capability('moodle/course:enrolreview', $context); $canreviewenrol = has_capability('moodle/course:enrolreview', $context);
@ -241,7 +240,6 @@ class core_user_renderer extends plugin_renderer_base {
} }
} }
// Add missing applied filters to the filter options. // Add missing applied filters to the filter options.
$filteroptions = $this->handle_missing_applied_filters($filtersapplied, $filteroptions); $filteroptions = $this->handle_missing_applied_filters($filtersapplied, $filteroptions);