From 2d9c6c3ae9588df3b42b07692a0fa0d40ef356e6 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 26 Jul 2017 09:45:48 -0600 Subject: [PATCH] Calendar - if editing event without popup, cancel loads normal calendar UI instead of doing nothing. --- calendar/inc/class.calendar_uiforms.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index bf5dac7532..8644807c34 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1845,7 +1845,8 @@ class calendar_uiforms extends calendar_ui } if ($preserved['no_popup']) { - $etpl->set_cell_attribute('button[cancel]','onclick',''); + // If not a popup, load the normal calendar interface on cancel + $etpl->set_cell_attribute('button[cancel]','onclick','app.calendar.linkHandler(\'index.php?menuaction=calendar.calendar_uiviews.index\')'); } // Allow admins to restore deleted events