summaryrefslogtreecommitdiffstats
path: root/web/react/components/more_direct_channels.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-08-02 09:01:06 -0800
committerCorey Hulen <corey@hulen.com>2015-08-02 09:01:06 -0800
commitadc8def9e06a7908d5f092088922dc26cbb277df (patch)
tree0022282ace537c73f108c4c8f168eaa61c3e3fbc /web/react/components/more_direct_channels.jsx
parentfaa9bbdf971adcfa31078302e660bb6942246fdb (diff)
parent633c39499b8a8ebbf334e41c002a787af0106ea2 (diff)
downloadchat-adc8def9e06a7908d5f092088922dc26cbb277df.tar.gz
chat-adc8def9e06a7908d5f092088922dc26cbb277df.tar.bz2
chat-adc8def9e06a7908d5f092088922dc26cbb277df.zip
Merge pull request #312 from mattermost/mm-1784
MM-1784 switching to a new PM channel now works in the more modal
Diffstat (limited to 'web/react/components/more_direct_channels.jsx')
-rw-r--r--web/react/components/more_direct_channels.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index 182d8884d..901cd228f 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -2,6 +2,7 @@
// See License.txt for license information.
var ChannelStore = require('../stores/channel_store.jsx');
+var TeamStore = require('../stores/team_store.jsx');
var utils = require('../utils/utils.jsx');
module.exports = React.createClass({
@@ -35,7 +36,7 @@ module.exports = React.createClass({
);
} else {
return (
- <li key={channel.name} className={active}><a className={"sidebar-channel " + titleClass} href={"/channels/"+channel.name}>{badge}{channel.display_name}</a></li>
+ <li key={channel.name} className={active}><a className={"sidebar-channel " + titleClass} href={TeamStore.getCurrentTeamUrl() + "/channels/"+channel.name}>{badge}{channel.display_name}</a></li>
);
}
});