From b9ce4a644d8e97ed05acb79033ea2f5043494ee4 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 20 Oct 2015 17:30:24 -0700
Subject: PLT-350 allow ability to disable restricted team names

---
 api/team.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'api')

diff --git a/api/team.go b/api/team.go
index f6038566a..2d7b05ff6 100644
--- a/api/team.go
+++ b/api/team.go
@@ -108,7 +108,7 @@ func createTeamFromSSO(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	team.Name = model.CleanTeamName(team.Name)
 
-	if err := team.IsValid(); err != nil {
+	if err := team.IsValid(*utils.Cfg.TeamSettings.RestrictTeamNames); err != nil {
 		c.Err = err
 		return
 	}
@@ -164,7 +164,7 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	teamSignup.Team.PreSave()
 
-	if err := teamSignup.Team.IsValid(); err != nil {
+	if err := teamSignup.Team.IsValid(*utils.Cfg.TeamSettings.RestrictTeamNames); err != nil {
 		c.Err = err
 		return
 	}
@@ -379,11 +379,6 @@ func FindTeamByName(c *Context, name string, all string) bool {
 		return false
 	}
 
-	if model.IsReservedTeamName(name) {
-		c.Err = model.NewAppError("findTeamByName", "This URL is unavailable. Please try another.", "name="+name)
-		return false
-	}
-
 	if result := <-Srv.Store.Team().GetByName(name); result.Err != nil {
 		return false
 	} else {
-- 
cgit v1.2.3-1-g7c22