From e5cf22bc9819173f3c984a270759672eb35659d6 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 28 Sep 2016 08:46:59 -0400 Subject: Show create account link for office365, ldap and saml (#4098) --- webapp/components/login/login_controller.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'webapp/components/login') diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index 117747ab9..fd5413c17 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -39,8 +39,6 @@ export default class LoginController extends React.Component { this.handleLoginIdChange = this.handleLoginIdChange.bind(this); this.handlePasswordChange = this.handlePasswordChange.bind(this); - this.checkSignUpEnabled = this.checkSignUpEnabled.bind(this); - this.state = { ldapEnabled: global.window.mm_license.IsLicensed === 'true' && global.window.mm_config.EnableLdap === 'true', usernameSigninEnabled: global.window.mm_config.EnableSignInWithUsername === 'true', @@ -279,7 +277,10 @@ export default class LoginController extends React.Component { checkSignUpEnabled() { return global.window.mm_config.EnableSignUpWithEmail === 'true' || global.window.mm_config.EnableSignUpWithGitLab === 'true' || - global.window.mm_config.EnableSignUpWithGoogle === 'true'; + global.window.mm_config.EnableSignUpWithOffice365 === 'true' || + global.window.mm_config.EnableSignUpWithGoogle === 'true' || + global.window.mm_config.EnableLdap === 'true' || + global.window.mm_config.EnableSaml === 'true'; } createLoginOptions() { -- cgit v1.2.3-1-g7c22