diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-21 11:31:31 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-21 11:31:31 -0400 |
| commit | 0e49acede9b077a1533d9a55494277fbc952d47c (patch) | |
| tree | 4991c8823458d57b127eff3106466188b6403675 /api | |
| parent | a4e6cce98eb0c04deaa929ccd28b266e312c0ca1 (diff) | |
| parent | 0bfdfd79f0071cfd41f2dfbe20d1cb099b57a15c (diff) | |
| download | chat-0e49acede9b077a1533d9a55494277fbc952d47c.tar.gz chat-0e49acede9b077a1533d9a55494277fbc952d47c.tar.bz2 chat-0e49acede9b077a1533d9a55494277fbc952d47c.zip | |
Merge pull request #1131 from mattermost/PLT-350
PLT-350 allow ability to disable restricted team names
Diffstat (limited to 'api')
| -rw-r--r-- | api/team.go | 9 |
1 files changed, 2 insertions, 7 deletions
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 { |