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

Small improvements for task attendee display

Browse source
This commit is contained in:
Thomas Bruederli 2014-08-21 10:28:25 +02:00
parent a9805a9063
commit 31b6446a2b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
View file

@ -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) {

2
plugins/tasklist/tasklist.js
View file

@ -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' })));
}
}