diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-08-02 16:37:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-02 16:37:09 -0400 |
commit | c4a3118e9f885e92bb9b7d882898e9a51fc3be69 (patch) | |
tree | 7564e7aa04e7c656781b34375d6964d029755c38 /webapp/routes/route_team.jsx | |
parent | e67bbcb0ae483cc86ae3a80ace36f1e6e663b589 (diff) | |
download | chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.gz chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.bz2 chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.zip |
PLT-3408 Add SiteURL to config.json (#3692)
* PLT-3408 Changed serverside code to get the service's URL from config.json
* PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location
* PLT-3408 Changed default SiteURL to be autodetected
Diffstat (limited to 'webapp/routes/route_team.jsx')
-rw-r--r-- | webapp/routes/route_team.jsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx index 27817710f..15217bfd2 100644 --- a/webapp/routes/route_team.jsx +++ b/webapp/routes/route_team.jsx @@ -12,7 +12,6 @@ import Constants from 'utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; import * as AsyncClient from 'utils/async_client.jsx'; import Client from 'client/web_client.jsx'; -import * as Utils from 'utils/utils.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import emojiRoute from 'routes/route_emoji.jsx'; @@ -57,7 +56,7 @@ function doChannelChange(state, replace, callback) { function preNeedsTeam(nextState, replace, callback) { // First check to make sure you're in the current team // for the current url. - var teamName = Utils.getTeamNameFromUrl(); + const teamName = nextState.params.team; var team = TeamStore.getByName(teamName); const oldTeamId = TeamStore.getCurrentId(); |