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

Merge branch 'MDL-51314-groupmembership' of https://github.com/dmitriim/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2015-11-10 14:44:22 +00:00
parent bcf2ea710c 6d6e297b13
commit 8e4c398b52
2 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+25 -5
View File
@@ -149,6 +149,9 @@ class assign {
/** @var array cached list of user groups. The cache key will be the user. */
private $usergroups = array();
/** @var array cached list of IDs of users who share group membership with the user. The cache key will be the user. */
private $sharedgroupmembers = array();
/**
* Constructor for the base assign class.
*
@@ -4681,15 +4684,32 @@ class assign {
$cm = $this->get_course_module();
if (groups_get_activity_groupmode($cm) == SEPARATEGROUPS) {
// These arrays are indexed by groupid.
$studentgroups = array_keys(groups_get_activity_allowed_groups($cm, $userid));
$gradergroups = array_keys(groups_get_activity_allowed_groups($cm, $graderid));
return count(array_intersect($studentgroups, $gradergroups)) > 0;
$sharedgroupmembers = $this->get_shared_group_members($cm, $graderid);
return in_array($userid, $sharedgroupmembers);
}
return true;
}
/**
* Returns IDs of the users who share group membership with the specified user.
*
* @param stdClass|cm_info $cm Course-module
* @param int $userid User ID
* @return array An array of ID of users.
*/
public function get_shared_group_members($cm, $userid) {
if (!isset($this->sharedgroupmembers[$userid])) {
$this->sharedgroupmembers[$userid] = array();
$groupsids = array_keys(groups_get_activity_allowed_groups($cm, $userid));
foreach ($groupsids as $groupid) {
$members = array_keys(groups_get_members($groupid, 'u.id'));
$this->sharedgroupmembers[$userid] = array_merge($this->sharedgroupmembers[$userid], $members);
}
}
return $this->sharedgroupmembers[$userid];
}
/**
* Returns a list of teachers that should be grading given submission.
*
mod/assign/tests/locallib_test.php
+48
View File
@@ -2281,5 +2281,53 @@ Anchor link 2:<a title=\"bananas\" href=\"../logo-240x60.gif\">Link text</a>
$this->assertEquals(false, strpos($output, get_string('hiddenuser', 'assign')));
$this->assertEquals(true, strpos($output, fullname($student))); //students full name doesn't appear.
}
/**
* Testing get_shared_group_members
*/
public function test_get_shared_group_members() {
$this->create_extra_users();
$this->setAdminUser();
// Force create an assignment with SEPARATEGROUPS.
$data = new stdClass();
$data->courseid = $this->course->id;
$data->name = 'Grouping';
$groupingid = groups_create_grouping($data);
groups_assign_grouping($groupingid, $this->groups[0]->id);
groups_assign_grouping($groupingid, $this->groups[1]->id);
$assign = $this->create_instance(array('groupingid' => $groupingid, 'groupmode' => SEPARATEGROUPS));
$cm = $assign->get_course_module();
// Add the capability to access allgroups.
$roleid = create_role('Access all groups role', 'accessallgroupsrole', '');
assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $roleid, $assign->get_context()->id);
role_assign($roleid, $this->extrastudents[3]->id, $assign->get_context()->id);
accesslib_clear_all_caches_for_unit_testing();
// Get shared group members for students 0 and 1.
$groupmembers = array();
$groupmembers[0] = $assign->get_shared_group_members($cm, $this->students[0]->id);
$groupmembers[1] = $assign->get_shared_group_members($cm, $this->students[1]->id);
// They should share groups with extrastudents 0 and 1.
$this->assertTrue(in_array($this->extrastudents[0]->id, $groupmembers[0]));
$this->assertFalse(in_array($this->extrastudents[0]->id, $groupmembers[1]));
$this->assertTrue(in_array($this->extrastudents[1]->id, $groupmembers[1]));
$this->assertFalse(in_array($this->extrastudents[1]->id, $groupmembers[0]));
// Lists of group members for students and extrastudents should be the same.
$this->assertEquals($groupmembers[0], $assign->get_shared_group_members($cm, $this->extrastudents[0]->id));
$this->assertEquals($groupmembers[1], $assign->get_shared_group_members($cm, $this->extrastudents[1]->id));
// Get all group members for extrastudent 3 wich can access all groups.
$allgroupmembers = $assign->get_shared_group_members($cm, $this->extrastudents[3]->id);
// Extrastudent 3 should see students 0 and 1, extrastudent 0 and 1.
$this->assertTrue(in_array($this->students[0]->id, $allgroupmembers));
$this->assertTrue(in_array($this->students[1]->id, $allgroupmembers));
$this->assertTrue(in_array($this->extrastudents[0]->id, $allgroupmembers));
$this->assertTrue(in_array($this->extrastudents[1]->id , $allgroupmembers));
}
}