Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube
This commit is contained in:
commit
9d4e55a75c
3 changed files with 13 additions and 3 deletions
|
@ -198,6 +198,9 @@ class calendar extends rcube_plugin
|
|||
|
||||
$this->rc->output->add_label('low','normal','high','delete','cancel','uploading','noemailwarning');
|
||||
|
||||
// initialize attendees autocompletion
|
||||
rcube_autocomplete_init();
|
||||
|
||||
$this->rc->output->send("calendar.calendar");
|
||||
}
|
||||
|
||||
|
|
|
@ -1887,7 +1887,15 @@ function rcube_calendar_ui(settings)
|
|||
$('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
|
||||
|
||||
// init attendees autocompletion
|
||||
rcmail.init_address_input_events($('#edit-attendee-name'));
|
||||
var ac_props;
|
||||
// parallel autocompletion
|
||||
if (rcmail.env.autocomplete_threads > 0) {
|
||||
ac_props = {
|
||||
threads: rcmail.env.autocomplete_threads,
|
||||
sources: rcmail.env.autocomplete_sources,
|
||||
};
|
||||
}
|
||||
rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
|
||||
rcmail.addEventListener('autocomplete_insert', function(e){ $('#edit-attendee-add').click(); });
|
||||
|
||||
$('#edit-attendee-add').click(function(){
|
||||
|
|
|
@ -400,7 +400,6 @@ class database_driver extends calendar_driver
|
|||
private function _update_event($event, $update_recurring = true)
|
||||
{
|
||||
$event = $this->_save_preprocess($event);
|
||||
console($event);
|
||||
$sql_set = array();
|
||||
$set_cols = array('all_day', 'recurrence', 'recurrence_id', 'title', 'description', 'location', 'categories', 'free_busy', 'priority', 'sensitivity', 'attendees', 'alarms', 'notifyat');
|
||||
foreach ($set_cols as $col) {
|
||||
|
|
Loading…
Add table
Reference in a new issue