summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-08-30 08:48:00 -0300
committerJoram Wilander <jwawilander@gmail.com>2016-08-30 07:48:00 -0400
commit3731cc5b675ec8d36623906f28dd3289a8e9ba93 (patch)
tree4f72eadf797c9fc744a5453b891883a5b6733c13
parent968df8c186f2923690ce63dc06f82165b90db469 (diff)
downloadchat-3731cc5b675ec8d36623906f28dd3289a8e9ba93.tar.gz
chat-3731cc5b675ec8d36623906f28dd3289a8e9ba93.tar.bz2
chat-3731cc5b675ec8d36623906f28dd3289a8e9ba93.zip
PLT-4008 go directly to the account creation page when 1 signup method enabled (#3894)
-rw-r--r--webapp/components/signup/signup_controller.jsx10
1 files changed, 8 insertions, 2 deletions
diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx
index 67d3b0c4f..a4ec26a5f 100644
--- a/webapp/components/signup/signup_controller.jsx
+++ b/webapp/components/signup/signup_controller.jsx
@@ -162,7 +162,7 @@ export default class SignupController extends React.Component {
);
}
- if (global.window.mm_config.EnableSignUpWithGoogle === 'true') {
+ if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_config.EnableSignUpWithGoogle === 'true') {
signupControls.push(
<a
className='btn btn-custom-login btn--full google'
@@ -180,7 +180,7 @@ export default class SignupController extends React.Component {
);
}
- if (global.window.mm_config.EnableSignUpWithOffice365 === 'true') {
+ if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_config.EnableSignUpWithOffice365 === 'true') {
signupControls.push(
<a
className='btn btn-custom-login btn--full office365'
@@ -251,6 +251,12 @@ export default class SignupController extends React.Component {
margin={true}
/>
);
+ } else if (signupControls.length === 1) {
+ if (global.window.mm_config.EnableSignUpWithEmail === 'true') {
+ return browserHistory.push('/signup_email' + window.location.search);
+ } else if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_config.EnableLdap === 'true') {
+ return browserHistory.push('/signup_ldap');
+ }
}
return signupControls;