Merge branch 'MDL-60468-master' of git://github.com/lameze/moodle

2017-10-19 10:23:57 +08:00
parent 4ee428fbe2 05187c589d
commit fd5e793cce
1 changed files with 7 additions and 2 deletions
@@ -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;
        }