fix(Felamimail): right message for event requests

tine20 · Aug 27, 2021 · 269f12e · 269f12e
1 parent 1c1f93b
commit 269f12e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/tine20/Calendar/js/Model.js b/tine20/Calendar/js/Model.js
@@ -191,6 +191,11 @@ Tine.Calendar.Model.Event = Tine.Tinebase.data.Record.create(Tine.Tinebase.Model
 
     getTitle: function() {
         return this.get('summary') + (this.hasPoll() ? '\u00A0\uFFFD' : '');
+    },
+
+    isRescheduled: function (event) {
+        return this.get('dtstart').toString() !== event.get('dtstart').toString() ||
+            this.get('dtend').toString()!== event.get('dtend').toString();
     }
 });
 

diff --git a/tine20/Calendar/js/iMIPDetailsPanel.js b/tine20/Calendar/js/iMIPDetailsPanel.js
@@ -235,9 +235,10 @@ Tine.Calendar.iMIPDetailsPanel = Ext.extend(Tine.Calendar.EventDetailsPanel, {
                         this.iMIPclause.setText(this.app.i18n._("This is an event invitation for someone else."));
                         break;
                     } else if (existingEvent && myAttenderstatus !== 'NEEDS-ACTION'
-                        && event.get('external_seq') <= existingEvent.get('external_seq')) {
+                        && (event.get('external_seq') <= existingEvent.get('external_seq')
+                        || event.get('seq') <= existingEvent.get('seq'))) {
                         this.iMIPclause.setText(this.app.i18n._("You have already replied to this event invitation."));
-                    } else if (existingEvent) {
+                    } else if (existingEvent && existingEvent.isRescheduled(event)) {
                         this.iMIPclause.setText(this.app.i18n._('The event got rescheduled. Set your response to:'));
                     } else {
                         this.iMIPclause.setText(this.app.i18n._('You received an event invitation. Set your response to:'));