3 commits - plugins/libkolab plugins/tasklist
Thomas Brüderli
bruederli at kolabsys.com
Thu Aug 21 10:29:24 CEST 2014
plugins/libkolab/lib/kolab_format.php | 2 +-
plugins/libkolab/lib/kolab_storage_cache.php | 2 +-
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php | 11 +++++++++++
plugins/tasklist/tasklist.js | 2 +-
4 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 419296757aad4da3499763a775d42688c3fced70
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Aug 21 10:29:04 2014 +0200
Bump version for iCal PRODID strings
diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index 4e53d85..ae7705c 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -45,7 +45,7 @@ abstract class kolab_format
protected $version = '3.0';
const KTYPE_PREFIX = 'application/x-vnd.kolab.';
- const PRODUCT_ID = 'Roundcube-libkolab-0.9';
+ const PRODUCT_ID = 'Roundcube-libkolab-1.1';
/**
* Factory method to instantiate a kolab_format object of the given type and version
commit 31b6446a2b4770e592ce993345a09ee8784c723c
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Aug 21 10:28:25 2014 +0200
Small improvements for task attendee display
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index 67baa4c..9a37df0 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -809,6 +809,17 @@ class tasklist_kolab_driver extends tasklist_driver
$task['alarms'] = $record['alarms'];
}
+ if (!empty($task['attendees'])) {
+ foreach ((array)$task['attendees'] as $i => $attendee) {
+ if (is_array($attendee['delegated-from'])) {
+ $task['attendees'][$i]['delegated-from'] = join(', ', $attendee['delegated-from']);
+ }
+ if (is_array($attendee['delegated-to'])) {
+ $task['attendees'][$i]['delegated-to'] = join(', ', $attendee['delegated-to']);
+ }
+ }
+ }
+
if (!empty($record['_attachments'])) {
foreach ($record['_attachments'] as $key => $attachment) {
if ($attachment !== false) {
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 4c07937..ff80731 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1830,7 +1830,7 @@ function rcube_tasklist_ui(settings)
$('#task-rsvp .itip-reply-comment textarea').hide().val('');
if (rec.organizer && !organizer) {
- $('#task-organizer').show().children('.task-text').html(task_attendee_html(rec.organizer));
+ $('#task-organizer').show().children('.task-text').html(task_attendee_html($.extend(rec.organizer, { role:'ORGANIZER' })));
}
}
commit a9805a90637468d1c753c55965c8101b72f0a714
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue Aug 19 19:20:15 2014 +0200
Don't break kolab_storage_cache::select() return data if reading one single cache entry fails
diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index 75728d1..d56f04d 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -491,7 +491,7 @@ class kolab_storage_cache
else if ($fetchall && ($object = $this->_unserialize($sql_arr))) {
$result[] = $object;
}
- else {
+ else if (!$fetchall) {
// only add msguid to dataset index
$result[] = $sql_arr;
}
More information about the commits
mailing list