diff options
Diffstat (limited to 'webapp/components/signup')
-rw-r--r-- | webapp/components/signup/components/signup_email.jsx | 4 | ||||
-rw-r--r-- | webapp/components/signup/components/signup_ldap.jsx | 7 | ||||
-rw-r--r-- | webapp/components/signup/signup_controller.jsx | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/webapp/components/signup/components/signup_email.jsx b/webapp/components/signup/components/signup_email.jsx index b67179604..aa3493c96 100644 --- a/webapp/components/signup/components/signup_email.jsx +++ b/webapp/components/signup/components/signup_email.jsx @@ -110,7 +110,7 @@ export default class SignupEmail extends React.Component { if (query.redirect_to) { browserHistory.push(query.redirect_to); } else { - browserHistory.push('/select_team'); + GlobalActions.redirectUserToDefaultTeam(); } } ); @@ -133,7 +133,7 @@ export default class SignupEmail extends React.Component { if (query.redirect_to) { browserHistory.push(query.redirect_to); } else { - browserHistory.push('/select_team'); + GlobalActions.redirectUserToDefaultTeam(); } } ); diff --git a/webapp/components/signup/components/signup_ldap.jsx b/webapp/components/signup/components/signup_ldap.jsx index bc8c073ad..d80b27159 100644 --- a/webapp/components/signup/components/signup_ldap.jsx +++ b/webapp/components/signup/components/signup_ldap.jsx @@ -90,8 +90,13 @@ export default class SignupLdap extends React.Component { finishSignup() { GlobalActions.emitInitialLoad( () => { + const query = this.props.location.query; GlobalActions.loadDefaultLocale(); - browserHistory.push('/select_team'); + if (query.redirect_to) { + browserHistory.push(query.redirect_to); + } else { + GlobalActions.redirectUserToDefaultTeam(); + } } ); } diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx index 0f0b6c867..3d853a9ee 100644 --- a/webapp/components/signup/signup_controller.jsx +++ b/webapp/components/signup/signup_controller.jsx @@ -122,7 +122,7 @@ export default class SignupController extends React.Component { } if (userLoggedIn) { - browserHistory.push('/select_team'); + GlobalActions.redirectUserToDefaultTeam(); } } } |