mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
MDL-9059, when teacher creates group event on calendar, they can not see it
This commit is contained in:
parent
755a625d95
commit
d12e3ff27f
@ -1163,10 +1163,25 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
|
|||||||
if(is_string($SESSION->cal_courses_shown)) {
|
if(is_string($SESSION->cal_courses_shown)) {
|
||||||
$SESSION->cal_courses_shown = intval($SESSION->cal_courses_shown);
|
$SESSION->cal_courses_shown = intval($SESSION->cal_courses_shown);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($courseeventsfrom === NULL) {
|
if($courseeventsfrom === NULL) {
|
||||||
$courseeventsfrom = $SESSION->cal_courses_shown;
|
$courseeventsfrom = $SESSION->cal_courses_shown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MDL-9059, $courseeventsfrom can be an int, or an array of ints, or an array of course objects
|
||||||
|
// convert all to array of objects
|
||||||
|
// we probably should do some clean up and make sure that session is set to use the proper form
|
||||||
|
if (is_int($courseeventsfrom)) { // case of an int, e.g. calendar view page
|
||||||
|
$c = array();
|
||||||
|
$c[$courseeventsfrom] = get_record('course', 'id', $courseeventsfrom);
|
||||||
|
$courseeventsfrom = $c;
|
||||||
|
} else if (is_array($courseeventsfrom)) { // case of an array of ints, e.g. course home page
|
||||||
|
foreach ($courseeventsfrom as $i=>$courseid) {
|
||||||
|
if (is_int($courseid)) {
|
||||||
|
$courseeventsfrom[$i] = get_record('course', 'id', $courseid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if($groupeventsfrom === NULL) {
|
if($groupeventsfrom === NULL) {
|
||||||
$groupeventsfrom = $SESSION->cal_courses_shown;
|
$groupeventsfrom = $SESSION->cal_courses_shown;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user