mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59831_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
David Monllao 2017-09-12 08:07:52 +02:00
commit 651f1a1703
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
user/index.php
View File

@ -103,6 +103,7 @@ echo $OUTPUT->heading(get_string('participants'));
// Get the currently applied filters.
$filtersapplied = optional_param_array('unified-filters', [], PARAM_TEXT);
$filterwassubmitted = optional_param('unified-filter-submitted', 0, PARAM_BOOL);
// Default group ID.
$groupid = false;
@ -168,9 +169,19 @@ foreach ($filtersapplied as $filter) {
}
}
// If course supports groups, but the user can't access all groups and there's no group filter set, apply a default group filter.
if ($groupid !== false && !$canaccessallgroups && !$hasgroupfilter) {
$filtersapplied[] = USER_FILTER_GROUP . ':' . $groupid;
// If course supports groups we may need to set a default.
if ($groupid !== false) {
// If we are in a course with visible groups and the user has not submitted anything and does not have
// access to all groups, then set a default group. This is the same behaviour in 3.3.
if (!$canaccessallgroups && !$filterwassubmitted && $course->groupmode == VISIBLEGROUPS) {
$filtersapplied[] = USER_FILTER_GROUP . ':' . $groupid;
} else if (!$canaccessallgroups && !$hasgroupfilter && $course->groupmode != VISIBLEGROUPS) {
// The user can't access all groups and has not set a group filter in a course where the groups are not visible
// then apply a default group filter.
$filtersapplied[] = USER_FILTER_GROUP . ':' . $groupid;
} else if (!$hasgroupfilter) { // No need for the group id to be set.
$groupid = false;
}
}
// Manage enrolments.

4
user/renderer.php
View File

@ -265,8 +265,8 @@ class core_user_renderer extends plugin_renderer_base {
// Filter options for groups, if available.
if ($course->groupmode != NOGROUPS) {
if (has_capability('moodle/site:accessallgroups', $context)) {
// List all groups if the user can access all groups.
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.

1
user/templates/unified_filter.mustache
View File

@ -58,6 +58,7 @@
<option value="{{value}}" {{#selected}}selected="selected"{{/selected}}>{{{label}}}</option>
{{/filteroptions}}
</select>
<input type="hidden" name="unified-filter-submitted" value="1">
<input type="submit" class="btn btn-primary" id="user-filter-button" value={{#quote}}{{#str}}filter{{/str}}{{/quote}}>
</form>
{{#js}}