diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-05 12:10:15 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-07-05 09:10:15 -0700 |
| commit | 039271394ee3aed5b265c6c5c5e1f8d979478970 (patch) | |
| tree | 5d78ca409f6e0615a667ce42adf9d8ae3d0a4668 /store/sql_team_store.go | |
| parent | 857d280007b39b7dbfe0057152083a332abd73d3 (diff) | |
| download | chat-039271394ee3aed5b265c6c5c5e1f8d979478970.tar.gz chat-039271394ee3aed5b265c6c5c5e1f8d979478970.tar.bz2 chat-039271394ee3aed5b265c6c5c5e1f8d979478970.zip | |
PLT-6753 Fixed deactivated users counting against max members on a team (#6758)
* PLT-6753 Fixed deactivated users counting against max members on a team
* Removed nested sql query when checking the number of team members
Diffstat (limited to 'store/sql_team_store.go')
| -rw-r--r-- | store/sql_team_store.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go index 6a2bcc9b0..b2c872880 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -494,9 +494,14 @@ func (s SqlTeamStore) SaveMember(member *model.TeamMember) StoreChannel { COUNT(0) FROM TeamMembers + INNER JOIN + Users + ON + TeamMembers.UserId = Users.Id WHERE TeamId = :TeamId - AND DeleteAt = 0`, map[string]interface{}{"TeamId": member.TeamId}); err != nil { + AND TeamMembers.DeleteAt = 0 + AND Users.DeleteAt = 0`, map[string]interface{}{"TeamId": member.TeamId}); err != nil { result.Err = model.NewLocAppError("SqlUserStore.Save", "store.sql_user.save.member_count.app_error", nil, "teamId="+member.TeamId+", "+err.Error()) storeChannel <- result close(storeChannel) |