summaryrefslogtreecommitdiffstats
path: root/api/team.go
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-06-29 10:24:45 -0400
committerJoramWilander <jwawilander@gmail.com>2015-06-29 10:24:45 -0400
commitd00f90d10c60c82fb74444c3c1118b380d149118 (patch)
tree814c2032f7daf758a6cdb622dfcde6a8e0dba0cf /api/team.go
parentcebb4bef843e848531bdf3465f49bd0d995efa8e (diff)
downloadchat-d00f90d10c60c82fb74444c3c1118b380d149118.tar.gz
chat-d00f90d10c60c82fb74444c3c1118b380d149118.tar.bz2
chat-d00f90d10c60c82fb74444c3c1118b380d149118.zip
new users now join off-topic defaultly
Diffstat (limited to 'api/team.go')
-rw-r--r--api/team.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/api/team.go b/api/team.go
index e4206505d..b776fc5ee 100644
--- a/api/team.go
+++ b/api/team.go
@@ -146,7 +146,10 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) {
} else {
rteam := result.Data.(*model.Team)
- CreateDefaultChannels(c, rteam.Id)
+ if _, err := CreateDefaultChannels(c, rteam.Id); err != nil {
+ c.Err = nil
+ return
+ }
teamSignup.User.TeamId = rteam.Id
teamSignup.User.EmailVerified = true
@@ -192,7 +195,10 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) {
} else {
rteam := result.Data.(*model.Team)
- CreateDefaultChannels(c, rteam.Id)
+ if _, err := CreateDefaultChannels(c, rteam.Id); err != nil {
+ c.Err = nil
+ return
+ }
if rteam.AllowValet {
CreateValet(c, rteam)