Enable free-busy UI for Kolab; show passed free-busy slots as 'unknown'
This commit is contained in:
parent
3efe8f5116
commit
a40f98f433
2 changed files with 7 additions and 2 deletions
|
@ -462,7 +462,7 @@ function rcube_calendar_ui(settings)
|
||||||
for (var j=0; j < event.attendees.length; j++)
|
for (var j=0; j < event.attendees.length; j++)
|
||||||
add_attendee(event.attendees[j], true);
|
add_attendee(event.attendees[j], true);
|
||||||
}
|
}
|
||||||
// $('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')]();
|
$('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')]();
|
||||||
|
|
||||||
// attachments
|
// attachments
|
||||||
if (calendar.attachments) {
|
if (calendar.attachments) {
|
||||||
|
|
|
@ -26,6 +26,7 @@ class kolab_driver extends calendar_driver
|
||||||
// features this backend supports
|
// features this backend supports
|
||||||
public $alarms = true;
|
public $alarms = true;
|
||||||
public $attendees = true;
|
public $attendees = true;
|
||||||
|
public $freebusy = true;
|
||||||
public $attachments = true;
|
public $attachments = true;
|
||||||
public $undelete = true;
|
public $undelete = true;
|
||||||
public $categoriesimmutable = true;
|
public $categoriesimmutable = true;
|
||||||
|
@ -787,6 +788,10 @@ class kolab_driver extends calendar_driver
|
||||||
$result[] = array($from, $to, isset($fbtypemap[$type]) ? $fbtypemap[$type] : calendar::FREEBUSY_BUSY);
|
$result[] = array($from, $to, isset($fbtypemap[$type]) ? $fbtypemap[$type] : calendar::FREEBUSY_BUSY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// set period from $start till the begin of the free-busy information as 'unknown'
|
||||||
|
if (($fbstart = $fb->getStart()) && $start < $fbstart) {
|
||||||
|
array_unshift($result, array($start, $fbstart, calendar::FREEBUSY_UNKNOWN));
|
||||||
|
}
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue