From 6f12a443e5a54800a0c815cc36837fb1d896c0e3 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 5 Oct 2017 11:20:21 -0600 Subject: [PATCH] Calendar - fix a few more missed ajax=true that were causing problems loading --- calendar/inc/class.calendar_uiforms.inc.php | 3 ++- calendar/inc/class.calendar_uiviews.inc.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index ec0abf92d1..f2fd7a1eda 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1069,6 +1069,7 @@ class calendar_uiforms extends calendar_ui Egw::redirect_link('/index.php',array( 'menuaction' => 'calendar.calendar_uiviews.index', 'msg' => $msg, + 'ajax' => 'true' )); } if (in_array($button,array('delete_exceptions','delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete') @@ -1847,7 +1848,7 @@ class calendar_uiforms extends calendar_ui if ($preserved['no_popup']) { // 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\')'); + $etpl->set_cell_attribute('button[cancel]','onclick','app.calendar.linkHandler(\'index.php?menuaction=calendar.calendar_uiviews.index&ajax=true\')'); } // Allow admins to restore deleted events diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index 8f9a54a50e..95ced6089f 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -454,6 +454,7 @@ class calendar_uiviews extends calendar_ui Egw::redirect_link('/index.php',array( 'menuaction' => 'calendar.calendar_uiviews.index', 'msg' => $merge, + 'ajax' => 'true' )); }