diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-07-13 07:39:14 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-13 07:39:14 -0400 |
| commit | 804bfd3b025097cc6f708c757fdd575ac47279f3 (patch) | |
| tree | a951d6ccd484ff6afb612405129f9e89a7a75908 /store | |
| parent | 540ebbd74db3a39007a1176e7bba2e275c3adf03 (diff) | |
| download | chat-804bfd3b025097cc6f708c757fdd575ac47279f3.tar.gz chat-804bfd3b025097cc6f708c757fdd575ac47279f3.tar.bz2 chat-804bfd3b025097cc6f708c757fdd575ac47279f3.zip | |
Fixing bug in inital load returning team member objects that had been deleted. (#3554)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_team_store.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go index ddcaa7896..002d2a3ea 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -265,7 +265,7 @@ func (s SqlTeamStore) GetTeamsByUserId(userId string) StoreChannel { result := StoreResult{} var data []*model.Team - if _, err := s.GetReplica().Select(&data, "SELECT Teams.* FROM Teams, TeamMembers WHERE TeamMembers.TeamId = Teams.Id AND TeamMembers.UserId = :UserId", map[string]interface{}{"UserId": userId}); err != nil { + if _, err := s.GetReplica().Select(&data, "SELECT Teams.* FROM Teams, TeamMembers WHERE TeamMembers.TeamId = Teams.Id AND TeamMembers.UserId = :UserId AND TeamMembers.DeleteAt = 0 AND Teams.DeleteAt = 0", map[string]interface{}{"UserId": userId}); err != nil { result.Err = model.NewLocAppError("SqlTeamStore.GetTeamsByUserId", "store.sql_team.get_all.app_error", nil, err.Error()) } |