From e914e6df66549ad44d8c60019ae510e558adb683 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Fri, 14 Jul 2023 08:49:28 -0600
Subject: [PATCH] Calendar: Stop conflict dialog from refreshing main view

---
 calendar/js/app.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index 58368e2d5f..b17bd0e1b5 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4010,8 +4010,17 @@ export class CalendarApp extends EgwApp
 		var all_loaded = this.sidebox_et2 !== null;
 
 		// Avoid home portlets using our templates, and get them right
-		if(_et2.uniqueId.indexOf('portlet') === 0) return;
-		if(_et2.uniqueId === 'calendar-add') return;
+		if(_et2.uniqueId.indexOf('portlet') === 0)
+		{
+			return;
+		}
+
+		// Skip templates not involved in main view
+		if(['calendar.conflicts', 'calendar.add'].includes(_name))
+		{
+			return;
+		}
+
 
 		// Flag to make sure we don't hide non-view templates
 		var view_et2 = false;