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

MDL-67494 calendar: only user overrides should retain userid

Browse Source
This commit is contained in:
Simey Lameze
2021-03-03 16:29:20 +08:00
parent 25f0a459c1
commit a08b268b27
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/lib.php
+3 -1
View File
@@ -302,7 +302,7 @@ function assign_update_events($assign, $override = null) {
// Events module won't show user events when the courseid is nonzero.
$event->courseid = ($userid) ? 0 : $assigninstance->course;
$event->groupid = $groupid;
$event->userid = $userid;
$event->userid = 0;
$event->modulename = 'assign';
$event->instance = $assigninstance->id;
$event->timestart = $duedate;
@@ -332,6 +332,8 @@ function assign_update_events($assign, $override = null) {
$params = new stdClass();
$params->assign = $assigninstance->name;
$eventname = get_string('overrideusereventname', 'assign', $params);
// Only set userid for user override events.
$event->userid = $userid;
// Set user override priority.
$event->priority = CALENDAR_EVENT_USER_OVERRIDE_PRIORITY;
} else {
mod/lesson/lib.php
+3 -1
View File
@@ -167,7 +167,7 @@ function lesson_update_events($lesson, $override = null) {
// Events module won't show user events when the courseid is nonzero.
$event->courseid = ($userid) ? 0 : $lesson->course;
$event->groupid = $groupid;
$event->userid = $userid;
$event->userid = 0;
$event->modulename = 'lesson';
$event->instance = $lesson->id;
$event->timestart = $available;
@@ -200,6 +200,8 @@ function lesson_update_events($lesson, $override = null) {
$params = new stdClass();
$params->lesson = $lesson->name;
$eventname = get_string('overrideusereventname', 'lesson', $params);
// Only set userid for user override events.
$event->userid = $userid;
// Set user override priority.
$event->priority = CALENDAR_EVENT_USER_OVERRIDE_PRIORITY;
} else {
mod/quiz/lib.php
+3 -1
View File
@@ -1268,7 +1268,7 @@ function quiz_update_events($quiz, $override = null) {
// Events module won't show user events when the courseid is nonzero.
$event->courseid = ($userid) ? 0 : $quiz->course;
$event->groupid = $groupid;
$event->userid = $userid;
$event->userid = 0;
$event->modulename = 'quiz';
$event->instance = $quiz->id;
$event->timestart = $timeopen;
@@ -1301,6 +1301,8 @@ function quiz_update_events($quiz, $override = null) {
$params = new stdClass();
$params->quiz = $quiz->name;
$eventname = get_string('overrideusereventname', 'quiz', $params);
// Only set userid for override events.
$event->userid = $userid;
// Set user override priority.
$event->priority = CALENDAR_EVENT_USER_OVERRIDE_PRIORITY;
} else {