mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
MDL-63117 mod_book: Add userid param to mod_book calendar callbacks
This commit is contained in:
parent
175b3708c9
commit
a4fd6c07ba
@ -755,20 +755,28 @@ function mod_book_get_fontawesome_icon_map() {
|
||||
*
|
||||
* @param calendar_event $event
|
||||
* @param \core_calendar\action_factory $factory
|
||||
* @param int $userid User id to use for all capability checks, etc. Set to 0 for current user (default).
|
||||
* @return \core_calendar\local\event\entities\action_interface|null
|
||||
*/
|
||||
function mod_book_core_calendar_provide_event_action(calendar_event $event,
|
||||
\core_calendar\action_factory $factory) {
|
||||
$cm = get_fast_modinfo($event->courseid)->instances['book'][$event->instance];
|
||||
\core_calendar\action_factory $factory,
|
||||
int $userid = 0) {
|
||||
global $USER;
|
||||
|
||||
if (empty($userid)) {
|
||||
$userid = $USER->id;
|
||||
}
|
||||
|
||||
$cm = get_fast_modinfo($event->courseid, $userid)->instances['book'][$event->instance];
|
||||
$context = context_module::instance($cm->id);
|
||||
|
||||
if (!has_capability('mod/book:read', $context)) {
|
||||
if (!has_capability('mod/book:read', $context, $userid)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$completion = new \completion_info($cm->get_course());
|
||||
|
||||
$completiondata = $completion->get_data($cm, false);
|
||||
$completiondata = $completion->get_data($cm, false, $userid);
|
||||
|
||||
if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
|
||||
return null;
|
||||
|
@ -160,6 +160,35 @@ class mod_book_lib_testcase extends advanced_testcase {
|
||||
$this->assertTrue($actionevent->is_actionable());
|
||||
}
|
||||
|
||||
public function test_book_core_calendar_provide_event_action_for_user() {
|
||||
// Create the activity.
|
||||
$course = $this->getDataGenerator()->create_course();
|
||||
$book = $this->getDataGenerator()->create_module('book', array('course' => $course->id));
|
||||
|
||||
// Enrol a student in the course.
|
||||
$student = $this->getDataGenerator()->create_and_enrol($course, 'student');
|
||||
|
||||
// Create a calendar event.
|
||||
$event = $this->create_action_event($course->id, $book->id,
|
||||
\core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
|
||||
|
||||
// Now, log out.
|
||||
$this->setUser();
|
||||
|
||||
// Create an action factory.
|
||||
$factory = new \core_calendar\action_factory();
|
||||
|
||||
// Decorate action event for the student.
|
||||
$actionevent = mod_book_core_calendar_provide_event_action($event, $factory, $student->id);
|
||||
|
||||
// Confirm the event was decorated.
|
||||
$this->assertInstanceOf('\core_calendar\local\event\value_objects\action', $actionevent);
|
||||
$this->assertEquals(get_string('view'), $actionevent->get_name());
|
||||
$this->assertInstanceOf('moodle_url', $actionevent->get_url());
|
||||
$this->assertEquals(1, $actionevent->get_item_count());
|
||||
$this->assertTrue($actionevent->is_actionable());
|
||||
}
|
||||
|
||||
public function test_book_core_calendar_provide_event_action_as_non_user() {
|
||||
global $CFG;
|
||||
|
||||
@ -216,6 +245,40 @@ class mod_book_lib_testcase extends advanced_testcase {
|
||||
$this->assertNull($actionevent);
|
||||
}
|
||||
|
||||
public function test_book_core_calendar_provide_event_action_already_completed_for_user() {
|
||||
global $CFG;
|
||||
|
||||
$CFG->enablecompletion = 1;
|
||||
|
||||
// Create the activity.
|
||||
$course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
|
||||
$book = $this->getDataGenerator()->create_module('book', array('course' => $course->id),
|
||||
array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
|
||||
|
||||
// Enrol a student in the course.
|
||||
$student = $this->getDataGenerator()->create_and_enrol($course, 'student');
|
||||
|
||||
// Get some additional data.
|
||||
$cm = get_coursemodule_from_instance('book', $book->id);
|
||||
|
||||
// Create a calendar event.
|
||||
$event = $this->create_action_event($course->id, $book->id,
|
||||
\core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
|
||||
|
||||
// Mark the activity as completed for the student.
|
||||
$completion = new completion_info($course);
|
||||
$completion->set_module_viewed($cm, $student->id);
|
||||
|
||||
// Create an action factory.
|
||||
$factory = new \core_calendar\action_factory();
|
||||
|
||||
// Decorate action event for the student.
|
||||
$actionevent = mod_book_core_calendar_provide_event_action($event, $factory, $student->id);
|
||||
|
||||
// Ensure result was null.
|
||||
$this->assertNull($actionevent);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an action event.
|
||||
*
|
||||
|
Loading…
x
Reference in New Issue
Block a user