diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:53:04 -0500 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:53:04 -0500 |
commit | 88d693a950fad663016a84407c90b8de280c0252 (patch) | |
tree | 571d01753c39f320b3634eae5723b76904d6bd48 /app/team.go | |
parent | 3fef21e350737c235e6dfc2d9f35311d65290c3e (diff) | |
parent | 82209b9452f3241c879591bd29a163538cb70b5e (diff) | |
download | chat-88d693a950fad663016a84407c90b8de280c0252.tar.gz chat-88d693a950fad663016a84407c90b8de280c0252.tar.bz2 chat-88d693a950fad663016a84407c90b8de280c0252.zip |
Merge branch 'release-4.7' into icu753
Diffstat (limited to 'app/team.go')
-rw-r--r-- | app/team.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/team.go b/app/team.go index 8e8c29e2a..a15c64c3f 100644 --- a/app/team.go +++ b/app/team.go @@ -302,10 +302,16 @@ func (a *App) joinUserToTeam(team *model.Team, user *model.User) (*model.TeamMem return rtm, true, nil } - if tmr := <-a.Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { - return nil, false, tmr.Err + if membersCount := <-a.Srv.Store.Team().GetActiveMemberCount(tm.TeamId); membersCount.Err != nil { + return nil, false, membersCount.Err + } else if membersCount.Data.(int64) >= int64(*a.Config().TeamSettings.MaxUsersPerTeam) { + return nil, false, model.NewAppError("joinUserToTeam", "app.team.join_user_to_team.max_accounts.app_error", nil, "teamId="+tm.TeamId, http.StatusBadRequest) } else { - return tmr.Data.(*model.TeamMember), false, nil + if tmr := <-a.Srv.Store.Team().UpdateMember(tm); tmr.Err != nil { + return nil, false, tmr.Err + } else { + return tmr.Data.(*model.TeamMember), false, nil + } } } else { // Membership appears to be missing. Lets try to add. |