L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-79611-403' of https://github.com/paulholden/moodle into MOODLE_403_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2023-10-11 18:15:46 +08:00
parent 1adf99597e cf5065ed71
commit bebde352fe
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/grouplib.php
+5 -3
View File
@@ -646,17 +646,19 @@ function groups_has_membership($cm, $userid=null) {
* @param int $groupid The groupid to get the users for
* @param int $fields The fields to return
* @param int $sort optional sorting of returned users
* @return array|bool Returns an array of the users for the specified
* group or false if no users or an error returned.
* @return array Returns an array of the users for the specified group
*/
function groups_get_members($groupid, $fields='u.*', $sort='lastname ASC') {
global $DB, $USER;
global $DB;
if (empty($groupid)) {
return [];
}
$courseid = $DB->get_field('groups', 'courseid', ['id' => $groupid]);
if ($courseid === false) {
return [];
}
$select = "SELECT $fields";
$from = "FROM {user} u
lib/tests/grouplib_test.php
+30 -5
View File
@@ -1755,6 +1755,8 @@ class grouplib_test extends \advanced_testcase {
/**
* Tests for groups_get_groups_members() method.
*
* @covers ::groups_get_groups_members
*/
public function test_groups_get_groups_members() {
$this->resetAfterTest(true);
@@ -1817,10 +1819,9 @@ class grouplib_test extends \advanced_testcase {
$members = groups_get_groups_members([$group3->id]);
$this->assertCount(0, $members);
// Test groups_get_members.
$members = groups_get_members($group2->id, 'u.*', 'u.id ASC');
$this->assertCount(2, $members);
$this->assertEquals([$user1->id, $user2->id], array_keys($members));
// Our second group.
$members = groups_get_groups_members([$group2->id]);
$this->assertEqualsCanonicalizing([$user1->id, $user2->id], array_column($members, 'id'));
// Test the info matches group membership for the entire course.
$groups = groups_get_all_groups($course2->id, 0, 0, 'g.*', true);
@@ -2182,10 +2183,34 @@ class grouplib_test extends \advanced_testcase {
$this->assertTrue(groups_is_member($groups['none']->id, $users[4]->id));
}
/**
* Test groups_get_members
*
* @covers ::groups_get_members
*/
public function test_groups_get_members(): void {
$this->resetAfterTest();
$course = $this->getDataGenerator()->create_course();
$userone = $this->getDataGenerator()->create_and_enrol($course);
$usertwo = $this->getDataGenerator()->create_and_enrol($course);
$group = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
$this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $userone->id]);
$this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $usertwo->id]);
$users = groups_get_members($group->id);
$this->assertEqualsCanonicalizing([$userone->id, $usertwo->id], array_column($users, 'id'));
// Test invalid group.
$users = groups_get_members(-1);
$this->assertEmpty($users);
}
/**
* Test groups_get_members() using groups with different visibility settings.
*
* @covers \groups_get_members()
* @covers ::groups_get_members
*/
public function test_groups_get_members_with_visibility(): void {
list($users, $groups) = $this->create_groups_with_visibilty();