diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-05 09:29:01 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-04-05 09:29:01 -0400 |
commit | b3edd32aee47a0b123870de58664600acc17087b (patch) | |
tree | 41840177672480ff428f279437a5a08a6eccaeb6 /webapp/components/user_settings/user_settings_modal.jsx | |
parent | c12d997f248c143b7746d07a3c2ce9b58a3ecd5e (diff) | |
download | chat-b3edd32aee47a0b123870de58664600acc17087b.tar.gz chat-b3edd32aee47a0b123870de58664600acc17087b.tar.bz2 chat-b3edd32aee47a0b123870de58664600acc17087b.zip |
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
Diffstat (limited to 'webapp/components/user_settings/user_settings_modal.jsx')
-rw-r--r-- | webapp/components/user_settings/user_settings_modal.jsx | 17 |
1 files changed, 0 insertions, 17 deletions
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 (<div/>); } - 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'}); |