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

MDL-58578 mod_quiz: Correctly provide group override priorities

Browse Source 
Previously the override priorities were being provided
back to front.
This commit is contained in:
Cameron Ball
2017-04-27 15:15:12 +08:00
parent 756a132ff6
commit 7eae70e167
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/lib.php
+4 -4
View File
@@ -1352,8 +1352,8 @@ function quiz_get_group_override_priorities($quizid) {
}
}
// Sort open times in descending manner. The earlier open time gets higher priority.
rsort($grouptimeopen);
// Sort open times in ascending manner. The earlier open time gets higher priority.
sort($grouptimeopen);
// Set priorities.
$opengrouppriorities = [];
$openpriority = 1;
@@ -1361,8 +1361,8 @@ function quiz_get_group_override_priorities($quizid) {
$opengrouppriorities[$timeopen] = $openpriority++;
}
// Sort close times in ascending manner. The later close time gets higher priority.
sort($grouptimeclose);
// Sort close times in descending manner. The later close time gets higher priority.
rsort($grouptimeclose);
// Set priorities.
$closegrouppriorities = [];
$closepriority = 1;
mod/quiz/tests/lib_test.php
+4 -4
View File
@@ -489,13 +489,13 @@ class mod_quiz_lib_testcase extends advanced_testcase {
$openpriorities = $priorities['open'];
// Override 2's time open has higher priority since it is sooner than override 1's.
$this->assertEquals(1, $openpriorities[$override1->timeopen]);
$this->assertEquals(2, $openpriorities[$override2->timeopen]);
$this->assertEquals(2, $openpriorities[$override1->timeopen]);
$this->assertEquals(1, $openpriorities[$override2->timeopen]);
$closepriorities = $priorities['close'];
// Override 1's time close has higher priority since it is later than override 2's.
$this->assertEquals(2, $closepriorities[$override1->timeclose]);
$this->assertEquals(1, $closepriorities[$override2->timeclose]);
$this->assertEquals(1, $closepriorities[$override1->timeclose]);
$this->assertEquals(2, $closepriorities[$override2->timeclose]);
}
public function test_quiz_core_calendar_provide_event_action_open() {