diff options
author | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
commit | 62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch) | |
tree | b0740451c56c68c5284834fd02bbce4d831acc17 /api/import.go | |
parent | ad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff) | |
parent | f3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff) | |
download | chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2 chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'api/import.go')
-rw-r--r-- | api/import.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api/import.go b/api/import.go index c39ec5220..59d098d93 100644 --- a/api/import.go +++ b/api/import.go @@ -22,7 +22,7 @@ func ImportPost(post *model.Post) { } } -func ImportUser(teamId string, user *model.User) *model.User { +func ImportUser(team *model.Team, user *model.User) *model.User { user.MakeNonNil() if result := <-Srv.Store.User().Save(user); result.Err != nil { @@ -31,14 +31,14 @@ func ImportUser(teamId string, user *model.User) *model.User { } else { ruser := result.Data.(*model.User) - if err := JoinDefaultChannels(teamId, ruser, ""); err != nil { - l4g.Error(utils.T("api.import.import_user.joining_default.error"), ruser.Id, teamId, err) - } - if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err) } + if err := JoinUserToTeam(team, user); err != nil { + l4g.Error(utils.T("api.import.import_user.join_team.error"), err) + } + return ruser } } |