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

MDL-48074 enrol: option to filter by users 'not in any group'

Browse source
This commit is contained in:
Davo Smith 2015-04-30 14:22:03 +01:00
parent e5eefbbf01
commit 0c9d8172b5
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
enrol/locallib.php
View file

@ -280,9 +280,14 @@ class course_enrolment_manager {
// Group condition. // Group condition.
if ($this->groupfilter) { if ($this->groupfilter) {
if ($this->groupfilter < 0) {
// Show users who are not in any group.
$sql .= " AND gm.groupid IS NULL";
} else {
$sql .= " AND gm.groupid = :groupid"; $sql .= " AND gm.groupid = :groupid";
$params['groupid'] = $this->groupfilter; $params['groupid'] = $this->groupfilter;
} }
}
// Status condition. // Status condition.
if ($this->statusfilter === ENROL_USER_ACTIVE) { if ($this->statusfilter === ENROL_USER_ACTIVE) {

1
enrol/users_forms.php
View file

@ -167,6 +167,7 @@ class enrol_users_filter_form extends moodleform {
// Filter by group. // Filter by group.
$allgroups = $manager->get_all_groups(); $allgroups = $manager->get_all_groups();
$groupsmenu[0] = get_string('allparticipants'); $groupsmenu[0] = get_string('allparticipants');
$groupsmenu[-1] = get_string('nogroup', 'enrol');
foreach($allgroups as $gid => $unused) { foreach($allgroups as $gid => $unused) {
$groupsmenu[$gid] = $allgroups[$gid]->name; $groupsmenu[$gid] = $allgroups[$gid]->name;
} }

1
lang/en/enrol.php
View file

@ -94,6 +94,7 @@ $string['manageinstance'] = 'Manage';
$string['migratetomanual'] = 'Migrate to manual enrolments'; $string['migratetomanual'] = 'Migrate to manual enrolments';
$string['nochange'] = 'No change'; $string['nochange'] = 'No change';
$string['noexistingparticipants'] = 'No existing participants'; $string['noexistingparticipants'] = 'No existing participants';
$string['nogroup'] = 'No group';
$string['noguestaccess'] = 'Guests can not access this course, please try to log in.'; $string['noguestaccess'] = 'Guests can not access this course, please try to log in.';
$string['none'] = 'None'; $string['none'] = 'None';
$string['notenrollable'] = 'You can not enrol yourself in this course.'; $string['notenrollable'] = 'You can not enrol yourself in this course.';