From 6611229cd7bd3cdfc0082c0a581145aaac0ab322 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Wed, 4 May 2016 06:31:42 -0700 Subject: PLT-2707 Adding option to show DM list from all of server (#2871) * PLT-2707 Adding option to show DM list from all of server * Fixing loc --- model/config.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'model/config.go') diff --git a/model/config.go b/model/config.go index b7c939202..872a5a68f 100644 --- a/model/config.go +++ b/model/config.go @@ -29,6 +29,9 @@ const ( GENERIC_NOTIFICATION = "generic" FULL_NOTIFICATION = "full" + DIRECT_MESSAGE_ANY = "any" + DIRECT_MESSAGE_TEAM = "team" + FAKE_SETTING = "********************************" ) @@ -162,6 +165,7 @@ type TeamSettings struct { RestrictTeamNames *bool EnableCustomBrand *bool CustomBrandText *string + RestrictDirectMessage *string } type LdapSettings struct { @@ -315,6 +319,11 @@ func (o *Config) SetDefaults() { *o.TeamSettings.EnableOpenServer = false } + if o.TeamSettings.RestrictDirectMessage == nil { + o.TeamSettings.RestrictDirectMessage = new(string) + *o.TeamSettings.RestrictDirectMessage = DIRECT_MESSAGE_ANY + } + if o.EmailSettings.EnableSignInWithEmail == nil { o.EmailSettings.EnableSignInWithEmail = new(bool) @@ -520,6 +529,10 @@ func (o *Config) IsValid() *AppError { return NewLocAppError("Config.IsValid", "model.config.is_valid.max_users.app_error", nil, "") } + if !(*o.TeamSettings.RestrictDirectMessage == DIRECT_MESSAGE_ANY || *o.TeamSettings.RestrictDirectMessage == DIRECT_MESSAGE_TEAM) { + return NewLocAppError("Config.IsValid", "model.config.is_valid.restrict_direct_message.app_error", nil, "") + } + if len(o.SqlSettings.AtRestEncryptKey) < 32 { return NewLocAppError("Config.IsValid", "model.config.is_valid.encrypt_sql.app_error", nil, "") } -- cgit v1.2.3-1-g7c22