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

Keep recurrence exceptions when updating an event

Browse source
This commit is contained in:
Thomas Bruederli 2011-06-01 18:44:24 +02:00
parent 4c21f13eaf
commit 7e42d3207d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.js
View file

@ -681,7 +681,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
if (event.location) { if (event.location) {
element.find('div.fc-event-title').after('<div class="fc-event-location">@&nbsp;' + Q(event.location) + '</div>'); element.find('div.fc-event-title').after('<div class="fc-event-location">@&nbsp;' + Q(event.location) + '</div>');
} }
if (event.recurrence_id) if (event.recurrence)
element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>'); element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>');
if (event.alarms) if (event.alarms)
element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>'); element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');

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

@ -191,6 +191,10 @@ class database_driver extends calendar_driver
if ($old['recurrence'] || $old['recurrence_id']) { if ($old['recurrence'] || $old['recurrence_id']) {
$master = $old['recurrence_id'] ? $this->get_event($old['recurrence_id']) : $old; $master = $old['recurrence_id'] ? $this->get_event($old['recurrence_id']) : $old;
// keep saved exceptions (not submitted by the client)
if ($old['recurrence']['EXDATE'])
$event['recurrence']['EXDATE'] = $old['recurrence']['EXDATE'];
switch ($event['savemode']) { switch ($event['savemode']) {
case 'new': case 'new':
$event['uid'] = $this->cal->generate_uid(); $event['uid'] = $this->cal->generate_uid();