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
RocketChat · Dec 20, 2018 · dda0fdf · dda0fdf
1 parent 1d1028d
commit dda0fdf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/rocketchat-ui-account/client/accountFlex.html b/packages/rocketchat-ui-account/client/accountFlex.html
@@ -17,12 +17,14 @@ <h1 class="sidebar-flex__title">{{_ "My_Account"}}</h1>
 				{{/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
@@ -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),