diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-10 14:24:16 -0500 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-10 14:24:16 -0500 |
commit | 8d5aa69950032777ea7286329d920de36aaa8a73 (patch) | |
tree | 8a4e32401d3bc9615221ab5a31015bff842be715 /webapp/components/signup_user_complete.jsx | |
parent | 805659239098a0b382a2a8bad704c2e91ab38ed6 (diff) | |
parent | bd106bb4018ab71dc1bc973d562bcda3dfbb6868 (diff) | |
download | chat-8d5aa69950032777ea7286329d920de36aaa8a73.tar.gz chat-8d5aa69950032777ea7286329d920de36aaa8a73.tar.bz2 chat-8d5aa69950032777ea7286329d920de36aaa8a73.zip |
Merge branch 'release-3.3' RC4
Diffstat (limited to 'webapp/components/signup_user_complete.jsx')
-rw-r--r-- | webapp/components/signup_user_complete.jsx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/webapp/components/signup_user_complete.jsx b/webapp/components/signup_user_complete.jsx index eec143996..4c2668ece 100644 --- a/webapp/components/signup_user_complete.jsx +++ b/webapp/components/signup_user_complete.jsx @@ -69,12 +69,12 @@ export default class SignupUserComplete extends React.Component { if ((inviteId && inviteId.length > 0) || (hash && hash.length > 0)) { // if we are already logged in then attempt to just join the team if (UserStore.getCurrentUser()) { - loading = true; Client.addUserToTeamFromInvite( data, hash, inviteId, (team) => { + loading = true; GlobalActions.emitInitialLoad( () => { browserHistory.push('/' + team.name); @@ -111,14 +111,12 @@ export default class SignupUserComplete extends React.Component { serverError: null, teamDisplayName: inviteData.display_name, teamName: inviteData.name, - teamId: inviteData.id, - loading: false + teamId: inviteData.id }); }, () => { this.setState({ noOpenServerError: true, - loading: false, serverError: <FormattedMessage id='signup_user_completed.invalid_invite' @@ -128,6 +126,7 @@ export default class SignupUserComplete extends React.Component { } ); + loading = false; data = ''; hash = ''; } @@ -145,8 +144,7 @@ export default class SignupUserComplete extends React.Component { <FormattedMessage id='signup_user_completed.no_open_server' defaultMessage='This server does not allow open signups. Please speak with your Administrator to receive an invitation.' - />, - loading: false + /> }); } |