diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-28 07:53:34 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-28 07:53:34 -0400 |
commit | 84f9c018e5e990676e45572ea4dcdd08ffa73f1d (patch) | |
tree | 35a88fc14f571f9a3e0fa0393fb84fce510f7be8 | |
parent | 7a25f2a78bc3afdaa7c55be5da66f3afa0fc965d (diff) | |
parent | 105333412e7fb95c3ce43958207bad922fc48cbb (diff) | |
download | chat-84f9c018e5e990676e45572ea4dcdd08ffa73f1d.tar.gz chat-84f9c018e5e990676e45572ea4dcdd08ffa73f1d.tar.bz2 chat-84f9c018e5e990676e45572ea4dcdd08ffa73f1d.zip |
Merge pull request #2532 from mattermost/ldap-switch-fix
Minor fix to let Sign-in Method settings show up when ldap is enabled
-rw-r--r-- | webapp/components/claim/components/email_to_ldap.jsx | 14 | ||||
-rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx index 1f51f9cd5..1ceb42a27 100644 --- a/webapp/components/claim/components/email_to_ldap.jsx +++ b/webapp/components/claim/components/email_to_ldap.jsx @@ -21,7 +21,7 @@ export default class EmailToLDAP extends React.Component { e.preventDefault(); var state = {}; - const password = ReactDOM.findDOMNode(this.refs.password).value.trim(); + const password = ReactDOM.findDOMNode(this.refs.emailpassword).value.trim(); if (!password) { state.error = Utils.localizeMessage('claim.email_to_ldap.pwdError', 'Please enter your password.'); this.setState(state); @@ -105,12 +105,18 @@ export default class EmailToLDAP extends React.Component { }} /> </p> + <input + type='text' + style={{display: 'none'}} + name='fakeusernameremembered' + /> <div className={formClass}> <input type='password' className='form-control' - name='password' - ref='password' + name='emailPassword' + ref='emailpassword' + autoComplete='off' placeholder={Utils.localizeMessage('claim.email_to_ldap.pwd', 'Password')} spellCheck='false' /> @@ -131,6 +137,7 @@ export default class EmailToLDAP extends React.Component { className='form-control' name='ldapId' ref='ldapid' + autoComplete='off' placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapId', 'LDAP ID')} spellCheck='false' /> @@ -141,6 +148,7 @@ export default class EmailToLDAP extends React.Component { className='form-control' name='ldapPassword' ref='ldappassword' + autoComplete='off' placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapPwd', 'LDAP Password')} spellCheck='false' /> diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 283d2c425..f937844ec 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -416,6 +416,7 @@ class SecurityTab extends React.Component { let numMethods = 0; numMethods = global.window.mm_config.EnableSignUpWithGitLab === 'true' ? numMethods + 1 : numMethods; numMethods = global.window.mm_config.EnableSignUpWithGoogle === 'true' ? numMethods + 1 : numMethods; + numMethods = global.window.mm_config.EnableLdap === 'true' ? numMethods + 1 : numMethods; if (global.window.mm_config.EnableSignUpWithEmail && numMethods > 0) { signInSection = this.createSignInSection(); |