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

Set savemode to 'current' for recurrence exceptions (#1725)

Browse source
This commit is contained in:
Thomas Bruederli 2013-04-17 09:15:34 +02:00
parent db055e29c7
commit c077ed555f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar_ui.js
View file

@ -523,7 +523,7 @@ function rcube_calendar_ui(settings)
// show warning if editing a recurring event // show warning if editing a recurring event
if (event.id && event.recurrence) { if (event.id && event.recurrence) {
var sel = event.thisandfuture ? 'future' : 'all'; var sel = event.thisandfuture ? 'future' : (event.isexception ? 'current' : 'all');
$('#edit-recurring-warning').show(); $('#edit-recurring-warning').show();
$('input.edit-recurring-savemode[value="'+sel+'"]').prop('checked', true); $('input.edit-recurring-savemode[value="'+sel+'"]').prop('checked', true);
} }

1
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -434,6 +434,7 @@ class kolab_calendar
$rec_event['recurrence_id'] = $event['uid']; $rec_event['recurrence_id'] = $event['uid'];
$rec_event['recurrence'] = $recurrence_rule; $rec_event['recurrence'] = $recurrence_rule;
$rec_event['_instance'] = $i; $rec_event['_instance'] = $i;
$rec_event['isexception'] = 1;
$events[] = $rec_event; $events[] = $rec_event;
// found the specifically requested instance, exiting... // found the specifically requested instance, exiting...