diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-06 10:35:17 +0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-07-05 22:35:17 -0400 |
| commit | beac2b0da089941e12e1918d148572b0c9e15ad6 (patch) | |
| tree | d80e26f49984d4d9c0d7deaa8884bcdedb5cd5e9 /model | |
| parent | 279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c (diff) | |
| download | chat-beac2b0da089941e12e1918d148572b0c9e15ad6.tar.gz chat-beac2b0da089941e12e1918d148572b0c9e15ad6.tar.bz2 chat-beac2b0da089941e12e1918d148572b0c9e15ad6.zip | |
teammate name display setting: username as default or full_name when LDAP/SAML is enabled (#6857)
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 14 |
1 files changed, 9 insertions, 5 deletions
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 |