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

MDL-43250 Assign: separate groups mode fix

Browse Source 
When in separate groups mode, only get graders in a group that is in the course module grouping.
This commit is contained in:
Damyon Wiese
2013-12-16 10:54:38 +08:00
parent 0e72987517
commit f268fb5d20
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+1 -1
View File
@@ -4214,7 +4214,7 @@ class assign {
$graders = array();
if (groups_get_activity_groupmode($this->get_course_module()) == SEPARATEGROUPS) {
if ($groups = groups_get_all_groups($this->get_course()->id, $userid)) {
if ($groups = groups_get_all_groups($this->get_course()->id, $userid, $this->get_course_module()->groupingid)) {
foreach ($groups as $group) {
foreach ($potentialgraders as $grader) {
if ($grader->id == $userid) {
mod/assign/tests/locallib_test.php
+11 -10
View File
@@ -756,27 +756,28 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
public function test_get_graders() {
$this->create_extra_users();
$this->setUser($this->editingteachers[0]);
$assign = $this->create_instance();
// Create an assignment with no groups.
$assign = $this->create_instance();
$this->assertCount(self::DEFAULT_TEACHER_COUNT +
self::DEFAULT_EDITING_TEACHER_COUNT +
self::EXTRA_TEACHER_COUNT +
self::EXTRA_EDITING_TEACHER_COUNT,
$assign->testable_get_graders($this->students[0]->id));
$assign = $this->create_instance();
// Force create an assignment with SEPARATEGROUPS.
$generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
$params = array('course'=>$this->course->id);
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
set_coursemodule_groupmode($cm->id, SEPARATEGROUPS);
$cm->groupmode = SEPARATEGROUPS;
$context = context_module::instance($cm->id);
$assign = new testable_assign($context, $cm, $this->course);
$data = new stdClass();
$data->courseid = $this->course->id;
$data->name = 'Grouping';
$groupingid = groups_create_grouping($data);
groups_assign_grouping($groupingid, $this->groups[0]->id);
$assign = $this->create_instance(array('groupingid' => $groupingid, 'groupmode' => SEPARATEGROUPS));
$this->setUser($this->students[1]);
$this->assertCount(4, $assign->testable_get_graders($this->students[0]->id));
// Note the second student is in a group that is not in the grouping.
// This means that we get all graders that are not in a group in the grouping.
$this->assertCount(10, $assign->testable_get_graders($this->students[1]->id));
}
public function test_group_members_only() {