holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Api: Fix merge action files in subdirectories had their path as part of action caption instead of just the file name

Browse Source
This commit is contained in:
nathan 2021-10-21 09:51:05 -06:00
parent b1af39be37
commit 4e54c2b5a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Storage/Merge.php
View File

@ -2607,7 +2607,7 @@ abstract class Merge
$action_base, $action_base,
array( array(
'icon' => Api\Vfs::mime_icon($file['mime']), 'icon' => Api\Vfs::mime_icon($file['mime']),
'caption' => Api\Vfs::decodePath($file['name']), 'caption' => Api\Vfs::decodePath(Api\Vfs::basename($file['name'])),
'onExecute' => 'javaScript:app.' . $GLOBALS['egw_info']['flags']['currentapp'] . '.merge', 'onExecute' => 'javaScript:app.' . $GLOBALS['egw_info']['flags']['currentapp'] . '.merge',
'merge_data' => $edit_attributes 'merge_data' => $edit_attributes
), ),