diff options
author | David Lu <david.lu@hotmail.com> | 2016-06-15 05:01:31 -0700 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-15 08:01:31 -0400 |
commit | 804705e0c54c25d2b8a507c0e64c568b6767b542 (patch) | |
tree | 6ba6cd46635cf0c26f0647bb39c075439504faf0 /webapp/actions | |
parent | 70711c82a3e57dc06812f5454944e97d0b00cfb3 (diff) | |
download | chat-804705e0c54c25d2b8a507c0e64c568b6767b542.tar.gz chat-804705e0c54c25d2b8a507c0e64c568b6767b542.tar.bz2 chat-804705e0c54c25d2b8a507c0e64c568b6767b542.zip |
Fixed DM channels not opening (#3336)
Diffstat (limited to 'webapp/actions')
-rw-r--r-- | webapp/actions/channel_actions.jsx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx index 5dc83379e..68020651d 100644 --- a/webapp/actions/channel_actions.jsx +++ b/webapp/actions/channel_actions.jsx @@ -2,12 +2,23 @@ // See License.txt for license information. import {browserHistory} from 'react-router'; - +import * as Utils from 'utils/utils.jsx'; import TeamStore from 'stores/team_store.jsx'; +import UserStore from 'stores/user_store.jsx'; import Client from 'utils/web_client.jsx'; export function goToChannel(channel) { - browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + channel.name); + if (channel.fake) { + Utils.openDirectChannelToUser( + UserStore.getProfileByUsername(channel.display_name), + () => { + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + channel.name); + }, + null + ); + } else { + browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + channel.name); + } } export function executeCommand(channelId, message, suggest, success, error) { |