From beac2b0da089941e12e1918d148572b0c9e15ad6 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 6 Jul 2017 10:35:17 +0800 Subject: teammate name display setting: username as default or full_name when LDAP/SAML is enabled (#6857) --- model/config.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'model/config.go') diff --git a/model/config.go b/model/config.go index 5f644fad0..b7526925f 100644 --- a/model/config.go +++ b/model/config.go @@ -717,11 +717,6 @@ func (o *Config) SetDefaults() { *o.TeamSettings.MaxNotificationsPerChannel = 1000 } - if o.TeamSettings.TeammateNameDisplay == nil { - o.TeamSettings.TeammateNameDisplay = new(string) - *o.TeamSettings.TeammateNameDisplay = SHOW_FULLNAME - } - if o.EmailSettings.EnableSignInWithEmail == nil { o.EmailSettings.EnableSignInWithEmail = new(bool) @@ -1236,6 +1231,15 @@ func (o *Config) SetDefaults() { *o.SamlSettings.LocaleAttribute = SAML_SETTINGS_DEFAULT_LOCALE_ATTRIBUTE } + if o.TeamSettings.TeammateNameDisplay == nil { + o.TeamSettings.TeammateNameDisplay = new(string) + *o.TeamSettings.TeammateNameDisplay = SHOW_USERNAME + + if *o.SamlSettings.Enable || *o.LdapSettings.Enable { + *o.TeamSettings.TeammateNameDisplay = SHOW_FULLNAME + } + } + if o.NativeAppSettings.AppDownloadLink == nil { o.NativeAppSettings.AppDownloadLink = new(string) *o.NativeAppSettings.AppDownloadLink = NATIVEAPP_SETTINGS_DEFAULT_APP_DOWNLOAD_LINK -- cgit v1.2.3-1-g7c22