From 4058d0f65902b638b28977e413ac5f8a4815b70c Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 24 Jun 2019 09:56:18 -0600 Subject: [PATCH] Calendar - make sure everything closes after you click 'Ignore conflict' on the popup after using quick event add --- calendar/inc/class.calendar_uiforms.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 09d9251c3c..b9d28f4093 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1448,6 +1448,10 @@ class calendar_uiforms extends calendar_ui $this->edit(); } + /** + * Get conflict dialog via ajax. Used by quick add. + * + */ public function ajax_conflicts() { $participants = json_decode($_GET['participants'],true); @@ -1470,7 +1474,7 @@ class calendar_uiforms extends calendar_ui ); } $content['participants'] = $participants; - $content['button'] = array('apply' => true); + $content['button'] = array('save' => true); return $this->process_edit($content); }