From 1d9a05e782446cd41286a007f8d3914297fe22c5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 13 Apr 2021 16:46:04 +0200
Subject: [PATCH] Fix reminders

---
 www/common/outer/calendar.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/calendar.js b/www/common/outer/calendar.js
index 41fdc40bc..ed6da0531 100644
--- a/www/common/outer/calendar.js
+++ b/www/common/outer/calendar.js
@@ -754,7 +754,18 @@ define([
             Realtime.whenRealtimeSyncs(c.lm.realtime, waitFor());
             if (newC) { Realtime.whenRealtimeSyncs(newC.lm.realtime, waitFor()); }
         }).nThen(function () {
-            if (changes.start || changes.reminders) { addReminders(ctx, id, ev); }
+            if (newC) {
+                // Move reminders to the new calendar
+                addReminders(ctx, id, {
+                    id: ev.id,
+                    start: 0
+                });
+                addReminders(ctx, ev.calendarId, ev);
+            } else if (changes.start || changes.reminders || changes.isAllDay) {
+                // Update reminders
+                addReminders(ctx, id, ev);
+            }
+
             sendUpdate(ctx, c);
             if (newC) { sendUpdate(ctx, newC); }
             cb();