summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_general.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/user_settings/user_settings_general.jsx')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index 07af50059..abf94fa6b 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -630,7 +630,7 @@ class UserSettingsGeneralTab extends React.Component {
let extraInfo;
let submit = null;
if (this.props.user.auth_service === '' ||
- (this.props.user.auth_service === 'ldap' &&
+ ((this.props.user.auth_service === 'ldap' || this.props.user.auth_service === Constants.SAML_SERVICE) &&
(global.window.mm_config.FirstNameAttributeSet === 'false' || global.window.mm_config.LastNameAttributeSet === 'false'))) {
inputs.push(
<div
@@ -765,7 +765,7 @@ class UserSettingsGeneralTab extends React.Component {
if (this.props.activeSection === 'nickname') {
let extraInfo;
let submit = null;
- if (this.props.user.auth_service === 'ldap' && global.window.mm_config.NicknameAttributeSet === 'true') {
+ if ((this.props.user.auth_service === 'ldap' || this.props.user.auth_service === Constants.SAML_SERVICE) && global.window.mm_config.NicknameAttributeSet === 'true') {
extraInfo = (
<span>
<FormattedMessage