From 26214a3aa3ce077b545ee569adaf6df48e153522 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 7 Feb 2023 09:47:58 +0100 Subject: [PATCH] Fix collabora app installed check and set the right action name --- mail/inc/class.mail_hooks.inc.php | 2 +- mail/js/app.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php index 86b52ae1e6..d64fdad4c9 100644 --- a/mail/inc/class.mail_hooks.inc.php +++ b/mail/inc/class.mail_hooks.inc.php @@ -818,7 +818,7 @@ class mail_hooks 'value' => 'downloadAllToZip' ] ]; - if (file_exists(EGW_SERVER_ROOT.'/collabora')) + if (!empty($GLOBALS['egw_info']['user']['apps']['collabora'])) { $actions['collabora'] = [ 'id' => 'collabora', diff --git a/mail/js/app.js b/mail/js/app.js index 163a5673e9..bfec782650 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -1143,7 +1143,7 @@ app.classes.mail = AppJS.extend( { if (egw.preference('document_doubleclick_action', 'filemanager') === 'collabora') { - _item.actions = 'downloadOneAsFile'; + _item.actions = 'collabora'; _item.actionsDefaultLabel = 'Collabora'; } sel_options.attachmentsBlock[_item.attachment_number + "[actions]"] = [...actions, collabora];