summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-02 08:19:40 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-02 08:19:40 -0400
commit57051a6c3f6dc43bfce635056c8482793a0bbcd0 (patch)
treece400edd198ba35347d7692ea7c98bc22404914b /web
parent8d6c35481124d7e30bdb559f440c48b3e5eb4e0d (diff)
parent57692bcb6d3632157d455d0c3199738340f0375e (diff)
downloadchat-57051a6c3f6dc43bfce635056c8482793a0bbcd0.tar.gz
chat-57051a6c3f6dc43bfce635056c8482793a0bbcd0.tar.bz2
chat-57051a6c3f6dc43bfce635056c8482793a0bbcd0.zip
Merge pull request #537 from mattermost/mm-2091
HOTFIX for 0.7.0 - MM-2091 Fix bad user being set on team creation causing Manage Team modal to not work.
Diffstat (limited to 'web')
-rw-r--r--web/react/components/team_signup_password_page.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx
index 6b21915f6..18cf05dad 100644
--- a/web/react/components/team_signup_password_page.jsx
+++ b/web/react/components/team_signup_password_page.jsx
@@ -41,7 +41,7 @@ module.exports = React.createClass({
client.loginByEmail(teamSignup.team.name, teamSignup.team.email, teamSignup.user.password,
function(data) {
UserStore.setLastEmail(teamSignup.team.email);
- UserStore.setCurrentUser(teamSignup.user);
+ UserStore.setCurrentUser(data);
if (this.props.hash > 0) {
BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: 'finished'}));
}