mirror of
https://github.com/moodle/moodle.git
synced 2025-08-07 01:46:45 +02:00
MDL-63144 mod_lti: Check if the module is visible to the user
This commit is contained in:
parent
f5dde8d05e
commit
3086259abb
2 changed files with 71 additions and 0 deletions
|
@ -658,6 +658,11 @@ function mod_lti_core_calendar_provide_event_action(calendar_event $event,
|
||||||
\core_calendar\action_factory $factory) {
|
\core_calendar\action_factory $factory) {
|
||||||
$cm = get_fast_modinfo($event->courseid)->instances['lti'][$event->instance];
|
$cm = get_fast_modinfo($event->courseid)->instances['lti'][$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());
|
$completion = new \completion_info($cm->get_course());
|
||||||
|
|
||||||
$completiondata = $completion->get_data($cm, false);
|
$completiondata = $completion->get_data($cm, false);
|
||||||
|
|
|
@ -131,6 +131,34 @@ class mod_lti_lib_testcase extends advanced_testcase {
|
||||||
$this->assertTrue($actionevent->is_actionable());
|
$this->assertTrue($actionevent->is_actionable());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_lti_core_calendar_provide_event_action_as_non_user() {
|
||||||
|
global $CFG;
|
||||||
|
|
||||||
|
$this->resetAfterTest();
|
||||||
|
$this->setAdminUser();
|
||||||
|
|
||||||
|
// Create the activity.
|
||||||
|
$course = $this->getDataGenerator()->create_course();
|
||||||
|
$lti = $this->getDataGenerator()->create_module('lti', array('course' => $course->id));
|
||||||
|
|
||||||
|
// Create a calendar event.
|
||||||
|
$event = $this->create_action_event($course->id, $lti->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_lti_core_calendar_provide_event_action($event, $factory);
|
||||||
|
|
||||||
|
// Confirm the event is not shown at all.
|
||||||
|
$this->assertNull($actionevent);
|
||||||
|
}
|
||||||
|
|
||||||
public function test_lti_core_calendar_provide_event_action_already_completed() {
|
public function test_lti_core_calendar_provide_event_action_already_completed() {
|
||||||
global $CFG;
|
global $CFG;
|
||||||
|
|
||||||
|
@ -165,6 +193,44 @@ class mod_lti_lib_testcase extends advanced_testcase {
|
||||||
$this->assertNull($actionevent);
|
$this->assertNull($actionevent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_lti_core_calendar_provide_event_action_already_completed_as_non_user() {
|
||||||
|
global $CFG;
|
||||||
|
|
||||||
|
$this->resetAfterTest();
|
||||||
|
$this->setAdminUser();
|
||||||
|
|
||||||
|
$CFG->enablecompletion = 1;
|
||||||
|
|
||||||
|
// Create the activity.
|
||||||
|
$course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
|
||||||
|
$lti = $this->getDataGenerator()->create_module('lti', array('course' => $course->id),
|
||||||
|
array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
|
||||||
|
|
||||||
|
// Get some additional data.
|
||||||
|
$cm = get_coursemodule_from_instance('lti', $lti->id);
|
||||||
|
|
||||||
|
// Create a calendar event.
|
||||||
|
$event = $this->create_action_event($course->id, $lti->id,
|
||||||
|
\core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
|
||||||
|
|
||||||
|
// Mark the activity as completed.
|
||||||
|
$completion = new completion_info($course);
|
||||||
|
$completion->set_module_viewed($cm);
|
||||||
|
|
||||||
|
// 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_lti_core_calendar_provide_event_action($event, $factory);
|
||||||
|
|
||||||
|
// Ensure result was null.
|
||||||
|
$this->assertNull($actionevent);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an action event.
|
* Creates an action event.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue