Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix modification of recurring events

Browse source
This commit is contained in:
Thomas 2011-09-01 00:16:59 +02:00
parent fb95e89345
commit 82d39a21f4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/calendar/calendar.php
View file

@ -564,17 +564,17 @@ class calendar extends rcube_plugin
$this->prepare_event($event, $action);
if ($success = $this->driver->edit_event($event))
$this->cleanup_event($event);
$reload = $success && $event['recurrence'] ? 2 : 1;
$reload = $success && ($event['recurrence'] || $event['savemode']) ? 2 : 1;
break;
case "resize":
$success = $this->driver->resize_event($event);
$reload = ($event['savemode'] == 'all' || $event['savemode'] == 'future') ? 2 : 1;
$reload = $event['savemode'] ? 2 : 1;
break;
case "move":
$success = $this->driver->move_event($event);
$reload = $success && ($event['savemode'] == 'all' || $event['savemode'] == 'future') ? 2 : 1;
$reload = $success && $event['savemode'] ? 2 : 1;
break;
case "remove":
@ -591,7 +591,7 @@ class calendar extends rcube_plugin
}
$success = $this->driver->remove_event($event, $undo_time < 1);
$reload = (!$success || $event['savemode'] == 'all' || $event['savemode'] == 'future') ? 2 : 1;
$reload = (!$success || $event['savemode']) ? 2 : 1;
if ($undo_time > 0 && $success) {
$_SESSION['calendar_event_undo'] = array('ts' => time(), 'data' => $event);

1
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -300,6 +300,7 @@ class kolab_calendar
{
$updated = false;
$old = $this->storage->getObject($event['id']);
$old['recurrence'] = ''; # clear old field, could have been removed in new, too
$object = array_merge($old, $this->_from_rcube_event($event));
$saved = $this->storage->save($object, $event['id']);