mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59671-master-fix' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2017-08-09 15:09:08 +08:00
commit ffd1747b11
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/classes/external/event_exporter.php vendored
View File

@ -236,7 +236,7 @@ class event_exporter extends exporter {
}
$values['canedit'] = calendar_edit_event_allowed($legacyevent);
$values['candelete'] = (!$values['isactionevent'] && $values['canedit']);
$values['candelete'] = calendar_delete_event_allowed($legacyevent);
// Handle event subscription.
$values['subscription'] = null;

9
calendar/delete.php
View File

@ -57,10 +57,10 @@ require_login($course);
if (!$course) {
$PAGE->set_context(context_system::instance()); //TODO: wrong
}
// Check the user has the required capabilities to edit an event
if (!calendar_edit_event_allowed($event)) {
print_error('nopermissions');
$title = get_string('deleteevent', 'calendar');
// Check the user has the required capabilities to delete an event
if (!calendar_delete_event_allowed($event)) {
print_error('nopermissions', 'error', $PAGE->url, $title);
}
// Count the repeats, do we need to consider the possibility of deleting repeats
@ -88,7 +88,6 @@ if ($confirm) {
}
// Prepare the page to show the confirmation form
$title = get_string('deleteevent', 'calendar');
$strcalendar = get_string('calendar', 'calendar');
$PAGE->navbar->add($strcalendar, $viewcalendarurl);

4
calendar/externallib.php
View File

@ -91,8 +91,8 @@ class core_calendar_external extends external_api {
$eventobj = calendar_event::load($event['eventid']);
// Let's check if the user is allowed to delete an event.
if (!calendar_edit_event_allowed($eventobj)) {
throw new moodle_exception("nopermissions");
if (!calendar_delete_event_allowed($eventobj)) {
throw new moodle_exception('nopermissions', 'error', '', get_string('deleteevent', 'calendar'));
}
// Time to do the magic.
$eventobj->delete($event['repeat']);

11
calendar/lib.php
View File

@ -2493,6 +2493,17 @@ function calendar_edit_event_allowed($event) {
return false;
}
/**
* Return the capability for deleting a calendar event.
*
* @param calendar_event $event The event object
* @return bool Whether the user has permission to delete the event or not.
*/
function calendar_delete_event_allowed($event) {
// Only allow delete if you have capabilities and it is not an module event.
return (calendar_edit_event_allowed($event) && empty($event->modulename));
}
/**
* Returns the default courses to display on the calendar when there isn't a specific
* course to display.

2
calendar/renderer.php
View File

@ -228,7 +228,7 @@ class core_calendar_renderer extends plugin_renderer_base {
$output .= $this->output->box_start('card-header clearfix');
if (calendar_edit_event_allowed($event) && $showactions) {
if (empty($event->cmid)) {
if (calendar_delete_event_allowed($event)) {
$editlink = new moodle_url(CALENDAR_URL.'event.php', array('action' => 'edit', 'id' => $event->id));
$deletelink = new moodle_url(CALENDAR_URL.'delete.php', array('id' => $event->id));
if (!empty($event->calendarcourseid)) {