L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-58363 mod_workshop: Remove calendar is_visible

Browse Source 
Part of MDL-55611 epic.
This commit is contained in:
Andrew Nicols
2017-04-03 11:37:09 +08:00
committed by Damyon Wiese
parent b375ec262d
commit 3957222d44
2 changed files with 1 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/workshop/lib.php
-12
View File
@@ -1786,18 +1786,6 @@ function workshop_calendar_update(stdClass $workshop, $cmid) {
}
}
/**
* Is the event visible?
*
* @param \core_calendar\event $event
* @return bool Returns true if the event is visible to the current user, false otherwise.
*/
function mod_workshop_core_calendar_is_event_visible(\core_calendar\event $event) {
$cm = get_fast_modinfo($event->courseid)->instances['workshop'][$event->instance];
$context = context_module::instance($cm->id);
return has_capability('mod/workshop:view', $context);
}
/**
* Handles creating actions for events.
*
mod/workshop/tests/lib_test.php
+1 -37
View File
@@ -31,43 +31,7 @@ require_once($CFG->dirroot . '/mod/workshop/lib.php');
* @copyright 2017 Simey Lameze <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_workshop_lib_testcase extends advanced_testcase
{
/**
* Test calendar event visibility.
*/
public function test_workshop_core_calendar_is_event_visible()
{
$this->resetAfterTest();
$this->setAdminUser();
$course = $this->getDataGenerator()->create_course();
$workshop = $this->getDataGenerator()->create_module('workshop', ['course' => $course->id]);
$event = $this->create_action_event($course->id, $workshop->id, WORKSHOP_EVENT_TYPE_SUBMISSION_OPEN);
$this->assertTrue(mod_workshop_core_calendar_is_event_visible($event));
}
/**
* Test calendar event visibility to a non-user.
*/
public function test_workshop_core_calendar_is_event_visible_as_non_user()
{
global $CFG;
$this->resetAfterTest();
$this->setAdminUser();
$course = $this->getDataGenerator()->create_course();
$workshop = $this->getDataGenerator()->create_module('workshop', array('course' => $course->id));
$event = $this->create_action_event($course->id, $workshop->id, WORKSHOP_EVENT_TYPE_SUBMISSION_OPEN);
// Log out the user and set force login to true.
\core\session\manager::init_empty_session();
$CFG->forcelogin = true;
$this->assertFalse(mod_workshop_core_calendar_is_event_visible($event));
}
class mod_workshop_lib_testcase extends advanced_testcase {
/**
* Test calendar event provide action open.