mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48073-master' of git://github.com/gurgus/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2015-01-19 11:36:47 +08:00
commit ba8e7b3e2f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
enrol/locallib.php
View File

@ -886,7 +886,7 @@ class course_enrolment_manager {
$args['search'] = $this->searchfilter;
}
if (!empty($this->groupfilter)) {
$args['group'] = $this->groupfilter;
$args['filtergroup'] = $this->groupfilter;
}
if ($this->statusfilter !== -1) {
$args['status'] = $this->statusfilter;

2
enrol/users.php
View File

@ -219,7 +219,7 @@ if (!has_capability('moodle/course:viewhiddenuserfields', $context)) {
$filterform = new enrol_users_filter_form('users.php', array('manager' => $manager, 'id' => $id),
'get', '', array('id' => 'filterform'));
$filterform->set_data(array('search' => $search, 'ifilter' => $filter, 'role' => $role));
$filterform->set_data(array('search' => $search, 'ifilter' => $filter, 'role' => $role, 'filtergroup' => $fgroup));
$table->set_fields($fields, $renderer);