File size: 5,171 Bytes
05f949e | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | diff --git a/enrol/locallib.php b/enrol/locallib.php
index b706ad230bafa..dd2818c582dde 100644
--- a/enrol/locallib.php
+++ b/enrol/locallib.php
@@ -570,17 +570,28 @@ public function search_other_users($search = '', $searchanywhere = false, $page
*/
public function search_users(string $search = '', bool $searchanywhere = false, int $page = 0, int $perpage = 25,
bool $returnexactcount = false) {
+ global $USER;
+
[$ufields, $joins, $params, $wherecondition] = $this->get_basic_search_conditions($search, $searchanywhere);
+ $groupmode = groups_get_course_groupmode($this->course);
+ if ($groupmode == SEPARATEGROUPS && !has_capability('moodle/site:accessallgroups', $this->context)) {
+ $groups = groups_get_all_groups($this->course->id, $USER->id, 0, 'g.id');
+ $groupids = array_column($groups, 'id');
+ } else {
+ $groupids = [];
+ }
+
+ [$enrolledsql, $enrolledparams] = get_enrolled_sql($this->context, '', $groupids);
+
$fields = 'SELECT ' . $ufields;
$countfields = 'SELECT COUNT(u.id)';
$sql = " FROM {user} u
$joins
- JOIN {user_enrolments} ue ON ue.userid = u.id
- JOIN {enrol} e ON ue.enrolid = e.id
- WHERE $wherecondition
- AND e.courseid = :courseid";
- $params['courseid'] = $this->course->id;
+ JOIN ($enrolledsql) je ON je.id = u.id
+ WHERE $wherecondition";
+
+ $params = array_merge($params, $enrolledparams);
return $this->execute_search_queries($search, $fields, $countfields, $sql, $params, $page, $perpage, 0, $returnexactcount);
}
diff --git a/enrol/tests/course_enrolment_manager_test.php b/enrol/tests/course_enrolment_manager_test.php
index c8cd3bdf38d4e..91b90edae1a4c 100644
--- a/enrol/tests/course_enrolment_manager_test.php
+++ b/enrol/tests/course_enrolment_manager_test.php
@@ -16,6 +16,7 @@
namespace core_enrol;
+use context_course;
use course_enrolment_manager;
/**
@@ -25,10 +26,11 @@
* @category test
* @copyright 2016 Ruslan Kabalin, Lancaster University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \course_enrolment_manager
*/
class course_enrolment_manager_test extends \advanced_testcase {
/**
- * The course context used in tests.
+ * The course used in tests.
* @var \stdClass
*/
private $course = null;
@@ -546,4 +548,57 @@ public function test_search_users($perpage, $returnexactcount, $expectedusers, $
$this->assertArrayNotHasKey('totalusers', $users);
}
}
+
+ /**
+ * Test that search_users observes course group mode restrictions correctly
+ */
+ public function test_search_users_course_groupmode(): void {
+ global $DB, $PAGE;
+
+ $this->resetAfterTest();
+
+ $teacher = $this->getDataGenerator()->create_and_enrol($this->course, 'teacher');
+ $this->getDataGenerator()->create_group_member(['groupid' => $this->groups['group1']->id, 'userid' => $teacher->id]);
+ $this->setUser($teacher);
+
+ $users = (new course_enrolment_manager($PAGE, $this->course))->search_users('', false, 0, 25, true);
+ $this->assertEqualsCanonicalizing([
+ $teacher->username,
+ $this->users['user0']->username,
+ $this->users['user1']->username,
+ $this->users['user21']->username,
+ $this->users['user22']->username,
+ $this->users['userall']->username,
+ $this->users['usertch']->username,
+ ], array_column($users['users'], 'username'));
+ $this->assertEquals(7, $users['totalusers']);
+
+ // Switch course to separate groups.
+ $this->course->groupmode = SEPARATEGROUPS;
+ update_course($this->course);
+
+ $users = (new course_enrolment_manager($PAGE, $this->course))->search_users('', false, 0, 25, true);
+ $this->assertEqualsCanonicalizing([
+ $teacher->username,
+ $this->users['user1']->username,
+ $this->users['userall']->username,
+ ], array_column($users['users'], 'username'));
+ $this->assertEquals(3, $users['totalusers']);
+
+ // Allow teacher to access all groups.
+ $roleid = $DB->get_field('role', 'id', ['shortname' => 'teacher']);
+ assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $roleid, context_course::instance($this->course->id)->id);
+
+ $users = (new course_enrolment_manager($PAGE, $this->course))->search_users('', false, 0, 25, true);
+ $this->assertEqualsCanonicalizing([
+ $teacher->username,
+ $this->users['user0']->username,
+ $this->users['user1']->username,
+ $this->users['user21']->username,
+ $this->users['user22']->username,
+ $this->users['userall']->username,
+ $this->users['usertch']->username,
+ ], array_column($users['users'], 'username'));
+ $this->assertEquals(7, $users['totalusers']);
+ }
}
|