From dda0fdf9327ac8ad360942c224dbfaffd19aedda Mon Sep 17 00:00:00 2001 From: Semih Serhat Karakaya Date: Fri, 21 Dec 2018 01:52:13 +0300 Subject: [PATCH] if webdav not enabled, do not show webdav integration account settings (#12569) [FIX] Webdav integration account settings were being shown even when Webdav was disabled --- packages/rocketchat-ui-account/client/accountFlex.html | 6 ++++-- packages/rocketchat-ui-account/client/accountFlex.js | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html index c8ba335c8b8c..47b837332109 100644 --- a/packages/rocketchat-ui-account/client/accountFlex.html +++ b/packages/rocketchat-ui-account/client/accountFlex.html @@ -17,12 +17,14 @@

{{_ "My_Account"}}

{{/if}} {{> sidebarItem menuItem "Security" "lock" "account" "security" }} - + {{#if encryptionEnabled}} {{> sidebarItem menuItem "Encryption" "key" "account" "encryption" }} {{/if}} - {{> sidebarItem menuItem "Integrations" "code" "account" "integrations" }} + {{#if webdavIntegrationEnabled}} + {{> sidebarItem menuItem "Integrations" "code" "account" "integrations" }} + {{/if}} {{#if accessTokensEnabled}} {{> sidebarItem menuItem "Personal_Access_Tokens" "key" "account" "tokens" }} diff --git a/packages/rocketchat-ui-account/client/accountFlex.js b/packages/rocketchat-ui-account/client/accountFlex.js index 71fcd1d8355e..31d2794b9f5b 100644 --- a/packages/rocketchat-ui-account/client/accountFlex.js +++ b/packages/rocketchat-ui-account/client/accountFlex.js @@ -23,6 +23,9 @@ Template.accountFlex.helpers({ encryptionEnabled() { return RocketChat.settings.get('E2E_Enable'); }, + webdavIntegrationEnabled() { + return RocketChat.settings.get('Webdav_Integration_Enabled'); + }, menuItem(name, icon, section, group) { return { name: t(name),