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

Fix duplicated event after editing an event with tasklist change (#5302)

Browse source
This commit is contained in:
Aleksander Machniak 2016-02-25 19:33:59 +01:00
parent e6a9819c32
commit 6f8465e9a8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/tasklist/tasklist.php
View file

@ -252,12 +252,16 @@ class tasklist extends rcube_plugin
$rec = $this->prepare_task($rec);
$clone = $this->handle_recurrence($rec, $this->driver->get_task($rec));
if ($success = $this->driver->edit_task($rec)) {
$refresh[] = $this->driver->get_task($rec);
$new_task = $this->driver->get_task($rec);
$new_task['tempid'] = $rec['id'];
$refresh[] = $new_task;
$this->cleanup_task($rec);
// add clone from recurring task
if ($clone && $this->driver->create_task($clone)) {
$refresh[] = $this->driver->get_task($clone);
$new_clone = $this->driver->get_task($clone);
$new_clone['tempid'] = $clone['id'];
$refresh[] = $new_clone;
$this->driver->clear_alarms($rec['id']);
}
@ -268,6 +272,7 @@ class tasklist extends rcube_plugin
if ($this->driver->move_task($child)) {
$r = $this->driver->get_task($child);
if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
$r['tempid'] = $cid;
$refresh[] = $r;
}
}