File 0008-T2561-Fix-recognizing-event-organizer-on-e... of Package roundcubemail-plugins-kolab

File 0008-T2561-Fix-recognizing-event-organizer-on-event-move-.patch of Package roundcubemail-plugins-kolab (Revision 61)

Currently displaying revision 61 , Show latest

From 40e0fa9155b5f971b802f57e32abbac18c9e45aa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 18 Jul 2017 14:04:18 +0000
Subject: [PATCH 8/8] T2561: Fix recognizing event organizer on event
 move/delete

---
 plugins/calendar/calendar_ui.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 7da1f594..7aaf98b6 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2511,13 +2511,15 @@ function rcube_calendar_ui(settings)
 
       if (!data) data = event;
       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
       if (_has_attendees) {
         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;
           checked = event.status != 'CANCELLED' ? checked : '';
           html += '<div class="message">' +
@@ -2525,12 +2527,12 @@ function rcube_calendar_ui(settings)
             rcmail.gettext('itipdeclineevent', 'calendar') + 
             '</label></div>';
         }
-        else {
+        else if (_is_organizer) {
           notify = true;
           if (settings.itip_notify & 2) {
             html += '<div class="message">' +
               '<label><input class="confirm-attendees-donotify" type="checkbox"' + checked + ' value="1" name="notify" />&nbsp;' +
-                rcmail.gettext((action == 'remove' ? 'sendcancellation' : 'sendnotifications'), 'calendar') + 
+                rcmail.gettext((action == 'remove' ? 'sendcancellation' : 'sendnotifications'), 'calendar') +
               '</label></div>';
           }
           else {
@@ -2545,7 +2547,7 @@ function rcube_calendar_ui(settings)
 
         // disable the 'future' savemode if I'm an attendee
         // 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';
         }
 
-- 
2.13.2