From 55c3a5584beef85dbecd909288a712dc7f294c8e Mon Sep 17 00:00:00 2001
From: Fabrice Mouhartem <fabrice.mouhartem@xwiki.com>
Date: Mon, 6 Nov 2023 16:56:09 +0100
Subject: [PATCH] #1306: Fix the reset after stopping a recurrence

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

diff --git a/www/common/outer/calendar.js b/www/common/outer/calendar.js
index e10db796f..43645a52a 100644
--- a/www/common/outer/calendar.js
+++ b/www/common/outer/calendar.js
@@ -896,7 +896,14 @@ define([
             if (['one','from'].includes(type.which) && !data.rawData.isOrigin) {
                 cleanAfter(type.when);
             } else {
-                update = ev.recUpdate = RECUPDATE;
+                if (changes.recurrenceRule.until) {
+                    // Remove changes after the last iteration
+                    cleanAfter(changes.recurrenceRule.until);
+                }
+                if (changes.recurrenceRule === "") {
+                    // Reset special cases when removing recurrence
+                    update = ev.recUpdate = RECUPDATE;
+                }
             }
         }