diff options
author | Corey Hulen <corey@hulen.com> | 2015-09-29 11:31:54 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-09-29 11:31:54 -0700 |
commit | e937beb51bc2166e0cb6658d5523aa584d2dd807 (patch) | |
tree | a65948450736885eef3ea9a3d00ac4e4843a1a96 /web/react/components/user_settings | |
parent | adfe129fcc5b2d19eb25ffb4da9709006272a964 (diff) | |
parent | ddf89518284649056c5884b209026ec1047e724f (diff) | |
download | chat-e937beb51bc2166e0cb6658d5523aa584d2dd807.tar.gz chat-e937beb51bc2166e0cb6658d5523aa584d2dd807.tar.bz2 chat-e937beb51bc2166e0cb6658d5523aa584d2dd807.zip |
Merge pull request #848 from mattermost/plt-488
PLT-488 Update incoming webhooks to hide DMs and accept direct JSON payloads.
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r-- | web/react/components/user_settings/manage_incoming_hooks.jsx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx index 1bbfbd162..fa2e2e5e4 100644 --- a/web/react/components/user_settings/manage_incoming_hooks.jsx +++ b/web/react/components/user_settings/manage_incoming_hooks.jsx @@ -21,7 +21,7 @@ export default class ManageIncomingHooks extends React.Component { this.getHooks(); } addNewHook() { - let hook = {}; //eslint-disable-line prefer-const + const hook = {}; hook.channel_id = this.state.channelId; Client.addIncomingHook( @@ -40,13 +40,13 @@ export default class ManageIncomingHooks extends React.Component { ); } removeHook(id) { - let data = {}; //eslint-disable-line prefer-const + const data = {}; data.id = id; Client.deleteIncomingHook( data, () => { - let hooks = this.state.hooks; //eslint-disable-line prefer-const + const hooks = this.state.hooks; let index = -1; for (let i = 0; i < hooks.length; i++) { if (hooks[i].id === id) { @@ -69,7 +69,7 @@ export default class ManageIncomingHooks extends React.Component { getHooks() { Client.listIncomingHooks( (data) => { - let state = this.state; //eslint-disable-line prefer-const + const state = this.state; if (data) { state.hooks = data; @@ -93,9 +93,11 @@ export default class ManageIncomingHooks extends React.Component { } const channels = ChannelStore.getAll(); - let options = []; //eslint-disable-line prefer-const + const options = []; channels.forEach((channel) => { - options.push(<option value={channel.id}>{channel.name}</option>); + if (channel.type !== Constants.DM_CHANNEL) { + options.push(<option value={channel.id}>{channel.name}</option>); + } }); let disableButton = ''; @@ -103,7 +105,7 @@ export default class ManageIncomingHooks extends React.Component { disableButton = ' disable'; } - let hooks = []; //eslint-disable-line prefer-const + const hooks = []; this.state.hooks.forEach((hook) => { const c = ChannelStore.get(hook.channel_id); hooks.push( |