diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-09-01 10:03:55 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-09-01 10:03:55 -0400 |
commit | 276e0189b1453b3b869f9ae834482d672b832158 (patch) | |
tree | ecac47da72f4954491c108b68b296c244a87c151 /webapp/components/user_settings | |
parent | e1e29a86d9f7da84d25fe205287eb0a9e0fecd2d (diff) | |
download | chat-276e0189b1453b3b869f9ae834482d672b832158.tar.gz chat-276e0189b1453b3b869f9ae834482d672b832158.tar.bz2 chat-276e0189b1453b3b869f9ae834482d672b832158.zip |
Making LDAP FirstName and LastName fields optional. (#3919)
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index cc63e4fbf..07af50059 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -629,7 +629,9 @@ class UserSettingsGeneralTab extends React.Component { if (this.props.activeSection === 'name') { let extraInfo; let submit = null; - if (this.props.user.auth_service === '') { + if (this.props.user.auth_service === '' || + (this.props.user.auth_service === 'ldap' && + (global.window.mm_config.FirstNameAttributeSet === 'false' || global.window.mm_config.LastNameAttributeSet === 'false'))) { inputs.push( <div key='firstNameSetting' |