From 034b17a49aebc57532a2fe9482f76d865247e142 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 7 Feb 2018 13:15:29 +0100 Subject: [PATCH] Implement new user preference in order to be able to select a handler for opening a merge print document --- api/src/Storage/Merge.php | 3 ++- filemanager/inc/class.filemanager_hooks.inc.php | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 20f873b95d..49773f55f4 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -1875,7 +1875,8 @@ abstract class Merge try { if (class_exists('EGroupware\\collabora\\Bo') && $GLOBALS['egw_info']['user']['apps']['collabora'] && - $discovery = \EGroupware\collabora\Bo::discover() + ($discovery = \EGroupware\collabora\Bo::discover()) && + $GLOBALS['egw_info']['user']['preferences']['filemanager']['merge_open_handler'] != 'download' ) { $editable_mimes = $discovery; diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php index ea209e9459..59480927c7 100644 --- a/filemanager/inc/class.filemanager_hooks.inc.php +++ b/filemanager/inc/class.filemanager_hooks.inc.php @@ -255,12 +255,20 @@ class filemanager_hooks ), 'collab_excluded_mimes' => array( 'type' => 'taglist', - 'label' => 'Excludes selected mime types', - 'help' => 'Excludes selected mime types from being opened by editor', + 'label' => lang('Excludes selected mime types'), + 'help' => lang('Excludes selected mime types from being opened by editor'), 'name' => 'collab_excluded_mimes', 'values' => array_combine(array_keys($editorLink['mime']), array_keys($editorLink['mime'])), 'default' => '', ), + 'merge_open_handler' => array( + 'type' => 'select', + 'label' => lang('Merge print open handler'), + 'help' => lang('Defines how to open a merge print documents'), + 'name' => 'merge_open_handler', + 'values' => array ('download' => lang('download'), 'collabora' => 'Collabora'), + 'default' => 'collabora', + ) ); return $settings;