Merge branch 'MDL-51495' of https://github.com/NeillM/moodle

moodle · Nov 11, 2015 · fdca1a1 · fdca1a1
2 parents 02c72ec + f11fdf9
commit fdca1a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/calendar/externallib.php b/calendar/externallib.php
@@ -173,6 +173,8 @@ public static function get_calendar_events($events = array(), $options = array()
 
         // Let us findout courses that we can return events from.
         if (!$hassystemcap) {
+            $courses = enrol_get_my_courses('id');
+            $courses = array_keys($courses);
             foreach ($params['events']['courseids'] as $id) {
                try {
                     $context = context_course::instance($id);
@@ -185,7 +187,6 @@ public static function get_calendar_events($events = array(), $options = array()
                         'warningcode' => 'nopermissions',
                         'message' => 'No access rights in course context '.$e->getMessage().$e->getTraceAsString()
                     );
-                    continue;
                 }
             }
         } else {

diff --git a/calendar/tests/externallib_test.php b/calendar/tests/externallib_test.php
@@ -363,6 +363,13 @@ public function test_get_calendar_events() {
         $events = external_api::clean_returnvalue(core_calendar_external::get_calendar_events_returns(), $events);
         $this->assertEquals(1, count($events['events'])); // site.
         $this->assertEquals(0, count($events['warnings']));
+
+        // Try getting a course event by its id.
+        $paramevents = array ('eventids' => array($courseevent->id));
+        $events = core_calendar_external::get_calendar_events($paramevents, $options);
+        $events = external_api::clean_returnvalue(core_calendar_external::get_calendar_events_returns(), $events);
+        $this->assertEquals(1, count($events['events']));
+        $this->assertEquals(0, count($events['warnings']));
     }
 
     /**