diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-09-09 16:41:33 -0300 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-09-09 16:41:33 -0300 |
commit | 672749b0ea9db636efbd418758f8f8fd22870543 (patch) | |
tree | af80a6a037c7dff5680686f1329b59d465840aa5 /webapp/components/signup | |
parent | 2b095fafccd4faf7f641353161c5392d84dcd631 (diff) | |
parent | 75ae8e1d81c9632b22b4b6f28dad21125f0fd8ba (diff) | |
download | chat-672749b0ea9db636efbd418758f8f8fd22870543.tar.gz chat-672749b0ea9db636efbd418758f8f8fd22870543.tar.bz2 chat-672749b0ea9db636efbd418758f8f8fd22870543.zip |
Merge branch 'release-3.4' RC5
Diffstat (limited to 'webapp/components/signup')
-rw-r--r-- | webapp/components/signup/components/signup_ldap.jsx | 4 | ||||
-rw-r--r-- | webapp/components/signup/signup_controller.jsx | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/webapp/components/signup/components/signup_ldap.jsx b/webapp/components/signup/components/signup_ldap.jsx index 76ad850c0..8c1b1bafb 100644 --- a/webapp/components/signup/components/signup_ldap.jsx +++ b/webapp/components/signup/components/signup_ldap.jsx @@ -39,16 +39,12 @@ export default class SignupLdap extends React.Component { } handleLdapIdChange(e) { - e.preventDefault(); - this.setState({ ldapId: e.target.value }); } handleLdapPasswordChange(e) { - e.preventDefault(); - this.setState({ ldapPassword: e.target.value }); diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx index 97a3a16d4..d34210760 100644 --- a/webapp/components/signup/signup_controller.jsx +++ b/webapp/components/signup/signup_controller.jsx @@ -79,9 +79,16 @@ export default class SignupController extends React.Component { } ); }, - (err) => { + () => { this.setState({ // eslint-disable-line react/no-did-mount-set-state - serverError: err.message + noOpenServerError: true, + loading: false, + serverError: ( + <FormattedMessage + id='signup_user_completed.invalid_invite' + defaultMessage='The invite link was invalid. Please speak with your Administrator to receive an invitation.' + /> + ) }); } ); @@ -281,8 +288,6 @@ export default class SignupController extends React.Component { ); } - let signupControls = this.renderSignupControls(); - let serverError = null; if (this.state.serverError) { serverError = ( @@ -292,8 +297,11 @@ export default class SignupController extends React.Component { ); } + let signupControls; if (this.state.noOpenServerError || this.state.usedBefore) { signupControls = null; + } else { + signupControls = this.renderSignupControls(); } return ( |