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

T2561: Fix recognizing event organizer on event move/delete

Browse source
This commit is contained in:
Aleksander Machniak 2017-07-18 14:04:18 +00:00
parent 63e217a803
commit 40e0fa9155
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/calendar_ui.js
View file

@ -2511,13 +2511,15 @@ function rcube_calendar_ui(settings)
if (!data) data = event; if (!data) data = event;
var decline = false, notify = false, html = '', cal = me.calendars[event.calendar], var decline = false, notify = false, html = '', cal = me.calendars[event.calendar],
_has_attendees = me.has_attendees(event), _is_organizer = me.is_organizer(event); _has_attendees = me.has_attendees(event),
_is_attendee = _has_attendees && me.is_attendee(event),
_is_organizer = me.is_organizer(event);
// event has attendees, ask whether to notify them // event has attendees, ask whether to notify them
if (_has_attendees) { if (_has_attendees) {
var checked = (settings.itip_notify & 1 ? ' checked="checked"' : ''); var checked = (settings.itip_notify & 1 ? ' checked="checked"' : '');
if (action == 'remove' && cal.group != 'shared' && !_is_organizer && me.is_attendee(event)) { if (action == 'remove' && cal.group != 'shared' && !_is_organizer && _is_attendee) {
decline = true; decline = true;
checked = event.status != 'CANCELLED' ? checked : ''; checked = event.status != 'CANCELLED' ? checked : '';
html += '<div class="message">' + html += '<div class="message">' +
@ -2525,7 +2527,7 @@ function rcube_calendar_ui(settings)
rcmail.gettext('itipdeclineevent', 'calendar') + rcmail.gettext('itipdeclineevent', 'calendar') +
'</label></div>'; '</label></div>';
} }
else { else if (_is_organizer) {
notify = true; notify = true;
if (settings.itip_notify & 2) { if (settings.itip_notify & 2) {
html += '<div class="message">' + html += '<div class="message">' +
@ -2545,7 +2547,7 @@ function rcube_calendar_ui(settings)
// disable the 'future' savemode if I'm an attendee // disable the 'future' savemode if I'm an attendee
// reason: no calendaring system supports the thisandfuture range parameter in iTip REPLY // reason: no calendaring system supports the thisandfuture range parameter in iTip REPLY
if (action == 'remove' && _has_attendees && !_is_organizer && me.is_attendee(event)) { if (action == 'remove' && !_is_organizer && _is_attendee) {
future_disabled = ' disabled'; future_disabled = ' disabled';
} }