summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-07-28 11:49:45 -0400
committerJoramWilander <jwawilander@gmail.com>2015-07-28 11:49:45 -0400
commit95123302419c2ea73e239ef5a62d1a0148d801dc (patch)
treee95fbdfa441b4aa63c647759e2cac9201275ecff /web/react
parent0bfc769b4dc03538b5ee1897a33febf7a45226a2 (diff)
downloadchat-95123302419c2ea73e239ef5a62d1a0148d801dc.tar.gz
chat-95123302419c2ea73e239ef5a62d1a0148d801dc.tar.bz2
chat-95123302419c2ea73e239ef5a62d1a0148d801dc.zip
updated changing email in sign up flow to work properly
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/signup_team_complete.jsx12
1 files changed, 8 insertions, 4 deletions
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 450a95dd0..559009f44 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -42,11 +42,15 @@ WelcomePage = React.createClass({
state.email_error = "";
}
- client.signupTeam(email, this.props.state.team.name,
+ client.signupTeam(email,
function(data) {
- this.props.state.wizard = "finished";
- this.props.updateParent(this.props.state);
- window.location.href = "/signup_team_confirm/?email=" + encodeURI(email);
+ if (data["follow_link"]) {
+ window.location.href = data["follow_link"];
+ } else {
+ this.props.state.wizard = "finished";
+ this.props.updateParent(this.props.state);
+ window.location.href = "/signup_team_confirm/?email=" + encodeURIComponent(team.email);
+ }
}.bind(this),
function(err) {
this.state.server_error = err.message;