diff options
| author | Corey Hulen <corey@hulen.com> | 2015-06-29 21:16:07 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-06-29 21:16:07 -0800 |
| commit | 4d2ca8881bf1aac6bc393988901b4ef523a5ef14 (patch) | |
| tree | ba2e8ac114866477d53060d67913e5ca9dfec64d /api/team.go | |
| parent | e6b5bdef82b23d61286ff455ee245a26a40d195f (diff) | |
| parent | ba998db0998e7782842e4f86a242edd1e52b5e97 (diff) | |
| download | chat-4d2ca8881bf1aac6bc393988901b4ef523a5ef14.tar.gz chat-4d2ca8881bf1aac6bc393988901b4ef523a5ef14.tar.bz2 chat-4d2ca8881bf1aac6bc393988901b4ef523a5ef14.zip | |
Merge pull request #98 from mattermost/mm-1199
fixes mm-1199 adds off-topic as a default channel
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/api/team.go b/api/team.go index 24b7ec9e1..15e4e2c17 100644 --- a/api/team.go +++ b/api/team.go @@ -146,10 +146,8 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) { } else { rteam := result.Data.(*model.Team) - channel := &model.Channel{DisplayName: "Town Square", Name: "town-square", Type: model.CHANNEL_OPEN, TeamId: rteam.Id} - - if _, err := CreateChannel(c, channel, r.URL.Path, false); err != nil { - c.Err = err + if _, err := CreateDefaultChannels(c, rteam.Id); err != nil { + c.Err = nil return } @@ -197,10 +195,8 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { } else { rteam := result.Data.(*model.Team) - channel := &model.Channel{DisplayName: "Town Square", Name: "town-square", Type: model.CHANNEL_OPEN, TeamId: rteam.Id} - - if _, err := CreateChannel(c, channel, r.URL.Path, false); err != nil { - c.Err = err + if _, err := CreateDefaultChannels(c, rteam.Id); err != nil { + c.Err = nil return } |