diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-21 13:03:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 13:03:54 -0500 |
| commit | 43c703e216c4145f5c61ed3b7453d72bd20306d0 (patch) | |
| tree | 6186a6e1488f28f2f9311fe8b05579d490ac49d8 /webapp/routes | |
| parent | 0ef77dff13bc74a396a412d7d416c7a7a3a9f447 (diff) | |
| download | chat-43c703e216c4145f5c61ed3b7453d72bd20306d0.tar.gz chat-43c703e216c4145f5c61ed3b7453d72bd20306d0.tar.bz2 chat-43c703e216c4145f5c61ed3b7453d72bd20306d0.zip | |
PLT-4787 Fixed not being able to join a channel through a link after opening the More Channels modal (#4616)
Diffstat (limited to 'webapp/routes')
| -rw-r--r-- | webapp/routes/route_team.jsx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx index 4bdfd1cc6..7d4c0c80c 100644 --- a/webapp/routes/route_team.jsx +++ b/webapp/routes/route_team.jsx @@ -29,13 +29,16 @@ function doChannelChange(state, replace, callback) { channel = JSON.parse(state.location.query.fakechannel); } else { channel = ChannelStore.getByName(state.params.channel); - if (!channel) { - channel = ChannelStore.getMoreByName(state.params.channel); - } + if (!channel) { Client.joinChannelByName( state.params.channel, (data) => { + AppDispatcher.handleServerAction({ + type: ActionTypes.RECEIVED_CHANNEL, + channel: data + }); + GlobalActions.emitChannelClickEvent(data); callback(); }, |