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

Fix disappearing free-busy event on refresh (#5462)

Browse source 
The issue was caused by missing event uid. On client-side all events
have had the same _id property and calendar widget couldn't properly
merge changes.
This commit is contained in:
Aleksander Machniak 2016-06-29 19:45:28 +02:00
parent 5a148797e1
commit 20833726b2
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/calendar/drivers/kolab/kolab_user_calendar.php
View file

@ -227,8 +227,9 @@ class kolab_user_calendar extends kolab_calendar
foreach (kolab_storage::list_user_folders($this->userdata, 'event', 2) as $foldername) { foreach (kolab_storage::list_user_folders($this->userdata, 'event', 2) as $foldername) {
$cal = new kolab_calendar($foldername, $this->cal); $cal = new kolab_calendar($foldername, $this->cal);
foreach ($cal->list_events($start, $end, $search, 1) as $event) { foreach ($cal->list_events($start, $end, $search, 1) as $event) {
$this->events[$event['id'] ?: $event['uid']] = $event; $uid = $event['id'] ?: $event['uid'];
$this->timeindex[$this->time_key($event)] = $event['id']; $this->events[$uid] = $event;
$this->timeindex[$this->time_key($event)] = $uid;
} }
} }
@ -332,7 +333,7 @@ class kolab_user_calendar extends kolab_calendar
foreach ($fb['periods'] as $tuple) { foreach ($fb['periods'] as $tuple) {
list($from, $to, $type) = $tuple; list($from, $to, $type) = $tuple;
$event = array( $event = array(
'id' => md5($this->id . $from->format('U') . '/' . $to->format('U')), 'uid' => md5($this->id . $from->format('U') . '/' . $to->format('U')),
'calendar' => $this->id, 'calendar' => $this->id,
'changed' => $fb['created'] ?: new DateTime(), 'changed' => $fb['created'] ?: new DateTime(),
'title' => $this->get_name() . ' ' . ($titlemap[$type] ?: $type), 'title' => $this->get_name() . ' ' . ($titlemap[$type] ?: $type),
@ -349,8 +350,8 @@ class kolab_user_calendar extends kolab_calendar
// avoid duplicate entries // avoid duplicate entries
$key = $this->time_key($event); $key = $this->time_key($event);
if (!$this->timeindex[$key]) { if (!$this->timeindex[$key]) {
$this->events[$event['id']] = $event; $this->events[$event['uid']] = $event;
$this->timeindex[$key] = $event['id']; $this->timeindex[$key] = $event['uid'];
$count++; $count++;
} }
} }
@ -412,15 +413,4 @@ class kolab_user_calendar extends kolab_calendar
{ {
return false; return false;
} }
/**
* Convert from Kolab_Format to internal representation
*/
private function _to_rcube_event($record)
{
$record['id'] = $record['uid'];
$record['calendar'] = $this->id;
return kolab_driver::to_rcube_event($record);
}
} }