diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-09 21:00:29 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-09 21:00:29 +0500 |
| commit | b61f653626df4183ddf2f3d26a4dd955436f15de (patch) | |
| tree | 2c274b5f5c112f49ca175fe053a2743bbb75218f /api | |
| parent | a533ff4d71cd6416d959ae970cded679242ba3e8 (diff) | |
| parent | b6fb6ea3be059d3c54027267760ccca0f95535ee (diff) | |
| download | chat-b61f653626df4183ddf2f3d26a4dd955436f15de.tar.gz chat-b61f653626df4183ddf2f3d26a4dd955436f15de.tar.bz2 chat-b61f653626df4183ddf2f3d26a4dd955436f15de.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'api')
| -rw-r--r-- | api/team.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/api/team.go b/api/team.go index 15e4e2c17..c4a0ca181 100644 --- a/api/team.go +++ b/api/team.go @@ -456,6 +456,15 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { user = result.Data.(*model.User) } + var invNum int64 = 0 + for i, invite := range invites.Invites { + if result := <-Srv.Store.User().GetByEmail(c.Session.TeamId, invite["email"]); result.Err == nil || result.Err.Message != "We couldn't find the existing account" { + invNum = int64(i) + c.Err = model.NewAppError("invite_members", "This person is already on your team", strconv.FormatInt(invNum, 10)) + return + } + } + ia := make([]string, len(invites.Invites)) for _, invite := range invites.Invites { ia = append(ia, invite["email"]) |