diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
| commit | 54894e90ac705eab3bf0f34c8dd197bb0929feae (patch) | |
| tree | 2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /api/team.go | |
| parent | c4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff) | |
| parent | 649f42e3fc706f8fa829276bcdb825381bc703f2 (diff) | |
| download | chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2 chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip | |
Fixing merge conflict
Diffstat (limited to 'api/team.go')
| -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 666fd909b..d39d8ed60 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 { |