From b3edd32aee47a0b123870de58664600acc17087b Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 5 Apr 2016 09:29:01 -0400 Subject: PLT-1750 Moved slash commands to backstage * Added slash commands to InstalledIntegrations page * Reset installed integration type filter if there is no longer any integrations of the selected type * Added pages to backstage to add slash commands * Cleaned up internationalization for slash commands * Added ability to regen slash command tokens from backstage * Removed Integrations tab from UserSettings --- webapp/components/user_settings/user_settings_modal.jsx | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'webapp/components/user_settings/user_settings_modal.jsx') diff --git a/webapp/components/user_settings/user_settings_modal.jsx b/webapp/components/user_settings/user_settings_modal.jsx index b71547baf..43fb728bd 100644 --- a/webapp/components/user_settings/user_settings_modal.jsx +++ b/webapp/components/user_settings/user_settings_modal.jsx @@ -31,10 +31,6 @@ const holders = defineMessages({ id: 'user.settings.modal.developer', defaultMessage: 'Developer' }, - integrations: { - id: 'user.settings.modal.integrations', - defaultMessage: 'Integrations' - }, display: { id: 'user.settings.modal.display', defaultMessage: 'Display' @@ -227,7 +223,6 @@ class UserSettingsModal extends React.Component { if (this.state.currentUser == null) { return (
); } - var isAdmin = Utils.isAdmin(this.state.currentUser.roles); var tabs = []; tabs.push({name: 'general', uiName: formatMessage(holders.general), icon: 'glyphicon glyphicon-cog'}); @@ -237,18 +232,6 @@ class UserSettingsModal extends React.Component { tabs.push({name: 'developer', uiName: formatMessage(holders.developer), icon: 'glyphicon glyphicon-th'}); } - if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true' || global.window.mm_config.EnableCommands === 'true') { - var show = global.window.mm_config.EnableOnlyAdminIntegrations !== 'true'; - - if (global.window.mm_config.EnableOnlyAdminIntegrations === 'true' && isAdmin) { - show = true; - } - - if (show) { - tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'}); - } - } - tabs.push({name: 'display', uiName: formatMessage(holders.display), icon: 'glyphicon glyphicon-eye-open'}); tabs.push({name: 'advanced', uiName: formatMessage(holders.advanced), icon: 'glyphicon glyphicon-list-alt'}); -- cgit v1.2.3-1-g7c22