summaryrefslogtreecommitdiffstats
path: root/store/sql_channel_store.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-10-28 12:41:28 -0400
committerCorey Hulen <corey@hulen.com>2016-10-28 09:41:28 -0700
commitef363fd88ebb731dbb0470ad7cb5f50de0f3845c (patch)
tree08cb5ded05da362e9f2b3ac90d63a7a8e91fd606 /store/sql_channel_store.go
parentfcf7d185f6ce0ff0a0719779261a487755273147 (diff)
downloadchat-ef363fd88ebb731dbb0470ad7cb5f50de0f3845c.tar.gz
chat-ef363fd88ebb731dbb0470ad7cb5f50de0f3845c.tar.bz2
chat-ef363fd88ebb731dbb0470ad7cb5f50de0f3845c.zip
Fix channel autocomplete and fix channel member query to ignore deleted channels (#4371)
Diffstat (limited to 'store/sql_channel_store.go')
-rw-r--r--store/sql_channel_store.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index d1d48ef69..8b77ab6ff 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -1040,6 +1040,7 @@ func (s SqlChannelStore) GetMembersForUser(teamId string, userId string) StoreCh
INNER JOIN Channels c
ON c.Id = cm.ChannelId
AND (c.TeamId = :TeamId OR c.TeamId = '')
+ AND c.DeleteAt = 0
WHERE cm.UserId = :UserId
`, map[string]interface{}{"TeamId": teamId, "UserId": userId})