3 commits - plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Thu Feb 26 16:28:40 CET 2015
plugins/calendar/calendar.php | 1 +
plugins/calendar/calendar_ui.js | 1 +
plugins/calendar/drivers/kolab/kolab_calendar.php | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1bcc7a48ef5359261309e2413543be4ae0500a3b
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Feb 26 16:28:35 2015 +0100
Do not check the 'decline' box by default when deleting cancelled events
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index eb57fa7..e8edcc8 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2591,6 +2591,7 @@ function rcube_calendar_ui(settings)
}
else if (action == 'remove' && is_attendee(event)) {
decline = true;
+ checked = event.status != 'CANCELLED' ? checked : '';
html += '<div class="message">' +
'<label><input class="confirm-attendees-decline" type="checkbox"' + checked + ' value="1" name="decline" /> ' +
rcmail.gettext('itipdeclineevent', 'calendar') +
commit d4f819bf94dd5c4f8e397237ddae99ef6de1f474
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Feb 26 16:25:51 2015 +0100
Fix deletion of single event occurrences (#4722)
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 6458d05..79450af 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -519,13 +519,13 @@ class kolab_calendar extends kolab_storage_folder_api
*/
public function delete_event($event, $force = true)
{
- $deleted = $this->storage->delete($event['id'], $force);
+ $deleted = $this->storage->delete($event['uid'] ?: $event['id'], $force);
if (!$deleted) {
rcube::raise_error(array(
'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Error deleting event object from Kolab server"),
+ 'message' => sprintf("Error deleting event object '%s' from Kolab server", $event['id'])),
true, false);
}
commit fc4cf15b30597085ee4da7f66ad381b2b9e22d2d
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Feb 26 16:24:39 2015 +0100
Fix iTip status display after import (#4722)
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 92f8340..5d32188 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -2749,6 +2749,7 @@ class calendar extends rcube_plugin
$metadata = array(
'uid' => $event['uid'],
+ '_instance' => $event['_instance'],
'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0,
'sequence' => intval($event['sequence']),
'fallback' => strtoupper($status),
More information about the commits
mailing list