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

Make undo work when deleting an instance of a recurring event (#441)

Browse source
This commit is contained in:
Thomas 2011-09-28 17:27:25 +02:00
parent 0e7007b5b5
commit f33ce42c01
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -476,6 +476,7 @@ class kolab_driver extends calendar_driver
$savemode = 'all'; $savemode = 'all';
$master = $event; $master = $event;
$this->rc->session->remove('calendar_restore_event_data');
$GLOBALS['conf']['kolab']['no_triggering'] = true; $GLOBALS['conf']['kolab']['no_triggering'] = true;
// read master if deleting a recurring event // read master if deleting a recurring event
@ -486,6 +487,8 @@ class kolab_driver extends calendar_driver
switch ($savemode) { switch ($savemode) {
case 'current': case 'current':
$_SESSION['calendar_restore_event_data'] = $master;
// removing the first instance => just move to next occurence // removing the first instance => just move to next occurence
if ($master['id'] == $event['id']) { if ($master['id'] == $event['id']) {
$recurring = reset($storage->_get_recurring_events($event, $event['start'], $event['end'] + 86400 * 370, $event['id'].'-1')); $recurring = reset($storage->_get_recurring_events($event, $event['start'], $event['end'] + 86400 * 370, $event['id'].'-1'));
@ -502,6 +505,8 @@ class kolab_driver extends calendar_driver
case 'future': case 'future':
if ($master['id'] != $event['id']) { if ($master['id'] != $event['id']) {
$_SESSION['calendar_restore_event_data'] = $master;
// set until-date on master event // set until-date on master event
$master['recurrence']['UNTIL'] = $event['start'] - 86400; $master['recurrence']['UNTIL'] = $event['start'] - 86400;
unset($master['recurrence']['COUNT']); unset($master['recurrence']['COUNT']);
@ -531,7 +536,12 @@ class kolab_driver extends calendar_driver
public function restore_event($event) public function restore_event($event)
{ {
if ($storage = $this->calendars[$event['calendar']]) { if ($storage = $this->calendars[$event['calendar']]) {
if ($success = $storage->restore_event($event)) if (!empty($_SESSION['calendar_restore_event_data']))
$success = $storage->update_event($_SESSION['calendar_restore_event_data']);
else
$success = $storage->restore_event($event);
if ($success)
$this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id)); $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
return $success; return $success;