diff options
| -rw-r--r-- | config/config.json | 2 | ||||
| -rw-r--r-- | model/config.go | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/config/config.json b/config/config.json index eea6b6851..3401a5e4f 100644 --- a/config/config.json +++ b/config/config.json @@ -80,7 +80,7 @@ "UserStatusAwayTimeout": 300, "MaxChannelsPerTeam": 2000, "MaxNotificationsPerChannel": 1000, - "TeammateNameDisplay": "full_name" + "TeammateNameDisplay": "username" }, "SqlSettings": { "DriverName": "mysql", 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 |