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

Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

Browse source
This commit is contained in:
Thomas Bruederli 2011-07-27 13:15:25 +02:00
commit 9d4e55a75c
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/calendar/calendar.php
View file

@ -198,6 +198,9 @@ class calendar extends rcube_plugin
$this->rc->output->add_label('low','normal','high','delete','cancel','uploading','noemailwarning'); $this->rc->output->add_label('low','normal','high','delete','cancel','uploading','noemailwarning');
// initialize attendees autocompletion
rcube_autocomplete_init();
$this->rc->output->send("calendar.calendar"); $this->rc->output->send("calendar.calendar");
} }

10
plugins/calendar/calendar_ui.js
View file

@ -1887,7 +1887,15 @@ function rcube_calendar_ui(settings)
$('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) }); $('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
// init attendees autocompletion // 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(); }); rcmail.addEventListener('autocomplete_insert', function(e){ $('#edit-attendee-add').click(); });
$('#edit-attendee-add').click(function(){ $('#edit-attendee-add').click(function(){

1
plugins/calendar/drivers/database/database_driver.php
View file

@ -400,7 +400,6 @@ class database_driver extends calendar_driver
private function _update_event($event, $update_recurring = true) private function _update_event($event, $update_recurring = true)
{ {
$event = $this->_save_preprocess($event); $event = $this->_save_preprocess($event);
console($event);
$sql_set = array(); $sql_set = array();
$set_cols = array('all_day', 'recurrence', 'recurrence_id', 'title', 'description', 'location', 'categories', 'free_busy', 'priority', 'sensitivity', 'attendees', 'alarms', 'notifyat'); $set_cols = array('all_day', 'recurrence', 'recurrence_id', 'title', 'description', 'location', 'categories', 'free_busy', 'priority', 'sensitivity', 'attendees', 'alarms', 'notifyat');
foreach ($set_cols as $col) { foreach ($set_cols as $col) {