From 45eec9d789f3bdcb30454ce02263a99f7df2026a Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 29 Aug 2024 10:18:38 -0600 Subject: [PATCH] Calendar: Fix sidebox merge --- calendar/inc/class.calendar_merge.inc.php | 5 +++++ calendar/js/app.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php index 1c762a0472..6b29a38702 100644 --- a/calendar/inc/class.calendar_merge.inc.php +++ b/calendar/inc/class.calendar_merge.inc.php @@ -153,6 +153,11 @@ class calendar_merge extends Api\Storage\Merge $ids = json_decode($_REQUEST['id'], true); } + // Need an array, and to modify the original to add path in + if(!is_array($_REQUEST['document'])) + { + $_REQUEST['document'] = [$_REQUEST['document']]; + } foreach($_REQUEST['document'] as &$document) { // Try to make time span into appropriate ranges to match diff --git a/calendar/js/app.ts b/calendar/js/app.ts index 8e10c41896..612a755d73 100644 --- a/calendar/js/app.ts +++ b/calendar/js/app.ts @@ -2372,7 +2372,7 @@ export class CalendarApp extends EgwApp menuaction: 'calendar.calendar_merge.merge_entries', document: widget.getValue(), merge: 'calendar_merge', - pdf: false, + options: {pdf: false}, select_all: false, id: JSON.stringify({ first: app.calendar.state.first,