diff options
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/admin_console/ldap_settings.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index 32cdbab3a..23728870e 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -236,7 +236,7 @@ export default class LdapSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.ldap.firstnameAttrDesc' - defaultMessage='The attribute in the LDAP server that will be used to populate the first name of users in Mattermost.' + defaultMessage='(Optional) The attribute in the LDAP server that will be used to populate the first name of users in Mattermost.' /> } value={this.state.firstNameAttribute} @@ -255,7 +255,7 @@ export default class LdapSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.ldap.lastnameAttrDesc' - defaultMessage='The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.' + defaultMessage='(Optional) The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.' /> } value={this.state.lastNameAttribute} 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' |