From e7a918c158c97e1035d179e67b7a6d06e658bb02 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 15 Sep 2020 10:43:08 -0600
Subject: [PATCH] * Calendar: Fix quick add did not open conflict dialog

---
 calendar/js/app.js | 2 +-
 calendar/js/app.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index ef46e7b442..8121d98473 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -1714,7 +1714,7 @@ var CalendarApp = /** @class */ (function (_super) {
                         this.dialog.destroy();
                         delete app.calendar.quick_add;
                     }
-                    else if (template) {
+                    else if (template || (template = etemplate2_1.etemplate2.getById("calendar-conflicts"))) {
                         // Open conflicts
                         var data = jQuery.extend({ menuaction: 'calendar.calendar_uiforms.ajax_conflicts' }, template.widgetContainer.getArrayMgr('content').data, app.calendar.quick_add);
                         egw.openPopup(egw.link('/index.php', data), 850, 300, 'conflicts', 'calendar');
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index 1e9f18ddf3..e5608384ca 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -1870,7 +1870,7 @@ class CalendarApp extends EgwApp
 					this.dialog.destroy();
 					delete app.calendar.quick_add;
 				}
-				else if (template)
+				else if (template || (template = etemplate2.getById("calendar-conflicts")))
 				{
 					// Open conflicts
 					var data = jQuery.extend(