diff --git a/mod/imscp/lib.php b/mod/imscp/lib.php index a7d48263e89..b6378623a04 100644 --- a/mod/imscp/lib.php +++ b/mod/imscp/lib.php @@ -493,6 +493,11 @@ function mod_imscp_core_calendar_provide_event_action(calendar_event $event, int $userid = 0) { $cm = get_fast_modinfo($event->courseid, $userid)->instances['imscp'][$event->instance]; + if (!$cm->uservisible) { + // The module is not visible to the user for any reason. + return null; + } + $completion = new \completion_info($cm->get_course()); $completiondata = $completion->get_data($cm, false, $userid); diff --git a/mod/imscp/tests/lib_test.php b/mod/imscp/tests/lib_test.php index 721c78083e7..f54e03ce07e 100644 --- a/mod/imscp/tests/lib_test.php +++ b/mod/imscp/tests/lib_test.php @@ -134,6 +134,8 @@ class mod_imscp_lib_testcase extends advanced_testcase { } public function test_imscp_core_calendar_provide_event_action_for_user() { + global $CFG; + $this->resetAfterTest(); $this->setAdminUser(); @@ -151,6 +153,7 @@ class mod_imscp_lib_testcase extends advanced_testcase { \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED); // Now log out. + $CFG->forcelogin = true; // We don't want to be logged in as guest, as guest users might still have some capabilities. $this->setUser(); // Create an action factory. @@ -167,6 +170,70 @@ class mod_imscp_lib_testcase extends advanced_testcase { $this->assertTrue($actionevent->is_actionable()); } + public function test_imscp_core_calendar_provide_event_action_as_non_user() { + global $CFG; + + $this->resetAfterTest(); + $this->setAdminUser(); + + // Create the activity. + $course = $this->getDataGenerator()->create_course(); + $imscp = $this->getDataGenerator()->create_module('imscp', array('course' => $course->id)); + + // Create a calendar event. + $event = $this->create_action_event($course->id, $imscp->id, + \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED); + + // Now log out. + $CFG->forcelogin = true; // We don't want to be logged in as guest, as guest users might still have some capabilities. + $this->setUser(); + + // Create an action factory. + $factory = new \core_calendar\action_factory(); + + // Decorate action event. + $actionevent = mod_imscp_core_calendar_provide_event_action($event, $factory); + + // Confirm the event is not shown at all. + $this->assertNull($actionevent); + } + + public function test_imscp_core_calendar_provide_event_action_in_hidden_section() { + global $CFG; + + $this->resetAfterTest(); + $this->setAdminUser(); + + // Create a course. + $course = $this->getDataGenerator()->create_course(); + + // Create a student. + $student = $this->getDataGenerator()->create_and_enrol($course, 'student'); + + // Create the activity. + $imscp = $this->getDataGenerator()->create_module('imscp', array('course' => $course->id)); + + // Create a calendar event. + $event = $this->create_action_event($course->id, $imscp->id, + \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED); + + // Set sections 0 as hidden. + set_section_visible($course->id, 0, 0); + + // Now log out. + $CFG->forcelogin = true; // We don't want to be logged in as guest, as guest users might still have some capabilities. + $this->setUser(); + + // Create an action factory. + $factory = new \core_calendar\action_factory(); + + // Decorate action event for the student. + $actionevent = mod_imscp_core_calendar_provide_event_action($event, $factory, $student->id); + + // Confirm the event is not shown at all. + $this->assertNull($actionevent); + } + public function test_imscp_core_calendar_provide_event_action_already_completed() { global $CFG;