summaryrefslogtreecommitdiffstats
path: root/model/config.go
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-06-30 16:06:59 +0800
committerGeorge Goldberg <george@gberg.me>2017-06-30 09:06:59 +0100
commiteea64f8049d90c5dcf14a739d640f5aa6a9c7add (patch)
treefabaa232bad7f4ebddf30b073c37a5962029f7fd /model/config.go
parentfb57b3dd53eaca28a557ea7e334e9d7216ce6aab (diff)
downloadchat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.tar.gz
chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.tar.bz2
chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.zip
[PLT-5864] Move teammate name display setting to the System Console (#6681)
* move teammate name display setting to the system console * update all the likes of TeammateNameDisplay names * fix gofmt error * rebase and fix conflict
Diffstat (limited to 'model/config.go')
-rw-r--r--model/config.go14
1 files changed, 14 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go
index 6d62aab91..5662ee9c0 100644
--- a/model/config.go
+++ b/model/config.go
@@ -39,6 +39,10 @@ const (
DIRECT_MESSAGE_ANY = "any"
DIRECT_MESSAGE_TEAM = "team"
+ SHOW_USERNAME = "username"
+ SHOW_NICKNAME_FULLNAME = "nickname_full_name"
+ SHOW_FULLNAME = "full_name"
+
PERMISSIONS_ALL = "all"
PERMISSIONS_CHANNEL_ADMIN = "channel_admin"
PERMISSIONS_TEAM_ADMIN = "team_admin"
@@ -322,6 +326,7 @@ type TeamSettings struct {
UserStatusAwayTimeout *int64
MaxChannelsPerTeam *int64
MaxNotificationsPerChannel *int64
+ TeammateNameDisplay *string
}
type LdapSettings struct {
@@ -702,6 +707,11 @@ 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)
@@ -1394,6 +1404,10 @@ func (o *Config) IsValid() *AppError {
return NewLocAppError("Config.IsValid", "model.config.is_valid.restrict_direct_message.app_error", nil, "")
}
+ if !(*o.TeamSettings.TeammateNameDisplay == SHOW_FULLNAME || *o.TeamSettings.TeammateNameDisplay == SHOW_NICKNAME_FULLNAME || *o.TeamSettings.TeammateNameDisplay == SHOW_USERNAME) {
+ return NewLocAppError("Config.IsValid", "model.config.is_valid.teammate_name_display.app_error", nil, "")
+ }
+
if len(o.SqlSettings.AtRestEncryptKey) < 32 {
return NewLocAppError("Config.IsValid", "model.config.is_valid.encrypt_sql.app_error", nil, "")
}