diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-04-04 12:24:12 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-04-04 12:24:12 -0400 |
| commit | 2bdab516b293d97f9797039e84f9d04656d2134d (patch) | |
| tree | cf53b8f94f4f3d7ec1d697457c9847009035c058 /webapp/components/more_direct_channels.jsx | |
| parent | 2bb9332467f54ed6e2bc39e088c1268a61b24b6e (diff) | |
| parent | 5f3111e8809ccc4fe32cc2958da5a47fd9c09bef (diff) | |
| download | chat-2bdab516b293d97f9797039e84f9d04656d2134d.tar.gz chat-2bdab516b293d97f9797039e84f9d04656d2134d.tar.bz2 chat-2bdab516b293d97f9797039e84f9d04656d2134d.zip | |
Merge pull request #2625 from mattermost/plt-2502
PLT-2502 Fxing some channel changing issues
Diffstat (limited to 'webapp/components/more_direct_channels.jsx')
| -rw-r--r-- | webapp/components/more_direct_channels.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx index 29d64517e..a83816c40 100644 --- a/webapp/components/more_direct_channels.jsx +++ b/webapp/components/more_direct_channels.jsx @@ -5,9 +5,9 @@ import {Modal} from 'react-bootstrap'; import FilteredUserList from './filtered_user_list.jsx'; import UserStore from 'stores/user_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import * as GlobalActions from 'action_creators/global_actions.jsx'; import {FormattedMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; import SpinnerButton from 'components/spinner_button.jsx'; import React from 'react'; @@ -69,7 +69,7 @@ export default class MoreDirectChannels extends React.Component { Utils.openDirectChannelToUser( teammate, (channel) => { - GlobalActions.emitChannelClickEvent(channel); + browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name); this.setState({loadingDMChannel: -1}); this.handleHide(); }, |