mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 07:25:30 +02:00
Code Issues Projects Releases Wiki Activity

MDL-60468 calendar: fix event type defaults logic

Browse Source
This commit is contained in:
Simey Lameze 2017-10-18 15:41:05 +08:00
parent 9a316f3367
commit 05187c589d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/lib.php
View File

@ -3225,11 +3225,16 @@ function calendar_output_fragment_event_form($args) {
true,
$data
);
if ($courseid != SITEID) {
// Let's check first which event types user can add.
calendar_get_allowed_types($allowed, $courseid);
// If the user is on course context and is allowed to add course events set the event type default to course.
if ($courseid != SITEID && !empty($allowed->courses)) {
$data['eventtype'] = 'course';
$data['courseid'] = $courseid;
$data['groupcourseid'] = $courseid;
} else if (!empty($categoryid)) {
} else if (!empty($categoryid) && !empty($allowed->category)) {
$data['eventtype'] = 'category';
$data['categoryid'] = $categoryid;
}