diff options
author | Corey Hulen <corey@hulen.com> | 2016-07-07 08:44:31 -0800 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-07 12:44:31 -0400 |
commit | 25385c8c2a46b236d902959ac20cd9f44789eeb8 (patch) | |
tree | 143a89880950a435edd5c5786c62210e1e019259 /webapp | |
parent | 3358d81fa79a1eb7c7e7bf96555ed279ea0df476 (diff) | |
download | chat-25385c8c2a46b236d902959ac20cd9f44789eeb8.tar.gz chat-25385c8c2a46b236d902959ac20cd9f44789eeb8.tar.bz2 chat-25385c8c2a46b236d902959ac20cd9f44789eeb8.zip |
PLT-2863 fixing bad merge that broke this PR (#3523)
* PLT-2863 adding remove user from team
* PLT-2863 adding the client side UI
* Fixing trailing space
* Fixing reported issues
* Adding documentatino
* Switching to final javascript driver
* Fixing bad merge
* Fixing bad merge
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/actions/global_actions.jsx | 13 | ||||
-rw-r--r-- | webapp/actions/websocket_actions.jsx | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index aa51f6f62..d9b89f987 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -205,6 +205,19 @@ export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) { ); } +export function emitLeaveTeam() { + Client.removeUserFromTeam( + TeamStore.getCurrentId(), + UserStore.getCurrentId(), + () => { + // DO nothing. The websocket should cause a re-direct + }, + (err) => { + AsyncClient.dispatchError(err, 'removeUserFromTeam'); + } + ); +} + export function emitLoadMorePostsEvent() { const id = ChannelStore.getCurrentId(); loadMorePostsTop(id, false); diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index 9d9cf62b7..7be9d84f3 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -14,6 +14,7 @@ import Client from 'utils/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; +import * as UserActions from 'actions/user_actions.jsx'; import {handleNewPost} from 'actions/post_actions.jsx'; import Constants from 'utils/constants.jsx'; @@ -232,6 +233,7 @@ function handleLeaveTeamEvent(msg) { browserHistory.push('/'); } } else if (TeamStore.getCurrentId() === msg.team_id) { + UserActions.getMoreDmList(); GlobalActions.emitProfilesForDmList(); } } |