extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix sidebox merge

Browse Source
This commit is contained in:
nathan 2024-08-29 10:18:38 -06:00
parent 1789b6be6f
commit 45eec9d789
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_merge.inc.php
View File

@ -153,6 +153,11 @@ class calendar_merge extends Api\Storage\Merge
$ids = json_decode($_REQUEST['id'], true); $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) foreach($_REQUEST['document'] as &$document)
{ {
// Try to make time span into appropriate ranges to match // Try to make time span into appropriate ranges to match

2
calendar/js/app.ts
View File

@ -2372,7 +2372,7 @@ export class CalendarApp extends EgwApp
menuaction: 'calendar.calendar_merge.merge_entries', menuaction: 'calendar.calendar_merge.merge_entries',
document: widget.getValue(), document: widget.getValue(),
merge: 'calendar_merge', merge: 'calendar_merge',
pdf: false, options: {pdf: false},
select_all: false, select_all: false,
id: JSON.stringify({ id: JSON.stringify({
first: app.calendar.state.first, first: app.calendar.state.first,