summaryrefslogtreecommitdiffstats
path: root/model/config.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-20 17:30:24 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-20 17:30:24 -0700
commitb9ce4a644d8e97ed05acb79033ea2f5043494ee4 (patch)
tree18856536744f9eb93a779997a006973c0ae6c2b7 /model/config.go
parent7ea8268ae88ecd3b94c0bf9bafbc169c50df4595 (diff)
downloadchat-b9ce4a644d8e97ed05acb79033ea2f5043494ee4.tar.gz
chat-b9ce4a644d8e97ed05acb79033ea2f5043494ee4.tar.bz2
chat-b9ce4a644d8e97ed05acb79033ea2f5043494ee4.zip
PLT-350 allow ability to disable restricted team names
Diffstat (limited to 'model/config.go')
-rw-r--r--model/config.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go
index 3a39df2f1..216b1de86 100644
--- a/model/config.go
+++ b/model/config.go
@@ -122,6 +122,7 @@ type TeamSettings struct {
EnableTeamCreation bool
EnableUserCreation bool
RestrictCreationToDomains string
+ RestrictTeamNames *bool
}
type Config struct {
@@ -169,6 +170,11 @@ func (o *Config) SetDefaults() {
o.ServiceSettings.EnableSecurityFixAlert = new(bool)
*o.ServiceSettings.EnableSecurityFixAlert = true
}
+
+ if o.TeamSettings.RestrictTeamNames == nil {
+ o.TeamSettings.RestrictTeamNames = new(bool)
+ *o.TeamSettings.RestrictTeamNames = true
+ }
}
func (o *Config) IsValid() *AppError {