diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js --- a/plugins/calendar/calendar_ui.js +++ b/plugins/calendar/calendar_ui.js @@ -783,6 +783,8 @@ $('#edit-identities-list').val(identity_id); $('#edit-attendees-form')[(allow_invitations?'show':'hide')](); $('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')](); + $('#event-panel-attendees #edit-attendees-legend')[(calendar.freebusy?'show':'hide')](); + $('#edit-attendees-table th.availability')[(calendar.freebusy?'show':'hide')](); }; // attachments @@ -1955,7 +1957,7 @@ var avail_tag = elastic ? ('' + '' + dispname + '' + - '' + avail_tag + ' data-email="' + data.email + '" />' + + (calendar.freebusy ? '' + avail_tag + ' data-email="' + data.email + '" />' : '') + '' + Q(status && !elastic ? status_label : '') + '' + (data.cutype != 'RESOURCE' ? '' + (organizer || readonly || !invbox ? '' : invbox) + '' : '') + '' + (organizer || readonly ? '' : dellink) + ''; diff --git a/plugins/calendar/drivers/caldav/caldav_driver.php b/plugins/calendar/drivers/caldav/caldav_driver.php --- a/plugins/calendar/drivers/caldav/caldav_driver.php +++ b/plugins/calendar/drivers/caldav/caldav_driver.php @@ -58,6 +58,10 @@ // $this->freebusy_trigger = $this->rc->config->get('calendar_freebusy_trigger', false); + if (!$this->rc->config->get('kolab_freebusy_server', false)) { + $this->freebusy = false; + } + // TODO: get configuration for the Bonnie API // $this->bonnie_api = libkolab::get_bonnie_api(); } diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php --- a/plugins/calendar/drivers/kolab/kolab_driver.php +++ b/plugins/calendar/drivers/kolab/kolab_driver.php @@ -66,6 +66,10 @@ $this->freebusy_trigger = $this->rc->config->get('calendar_freebusy_trigger', false); + if (!$this->rc->config->get('kolab_freebusy_server', false)) { + $this->freebusy = false; + } + if (kolab_storage::$version == '2.0') { $this->alarm_types = ['DISPLAY']; $this->alarm_absolute = false;