diff options
| author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-07-30 15:06:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 15:06:08 -0400 |
| commit | 5872bf9c2f9b81c7aad761d40a6970f6267f1424 (patch) | |
| tree | 2f850c0678f9fbd8979d41cb758503ca6cb1a2d7 /store/sqlstore/post_store.go | |
| parent | 65cd447a61efa852da2c0e7db25f385c2436e236 (diff) | |
| download | chat-5872bf9c2f9b81c7aad761d40a6970f6267f1424.tar.gz chat-5872bf9c2f9b81c7aad761d40a6970f6267f1424.tar.bz2 chat-5872bf9c2f9b81c7aad761d40a6970f6267f1424.zip | |
Pr 9039 (#9187)
* MM-11065: Allow to search and get archived channels from the API
* Fixing more tests
* Add some unit tests
* Add includeDeleted parameter to session permissions check function
* More test fixing
* Adding archive channels list in channels search
* Add restriction for archived channel edition
* Reverting permissions checks modification
* Changed the query parameter to include_deleted
* Enable search archive channels as true by default
* Adding tests for verify search on deleted channels
* Allowing to override archive channels during the imports
* Fixed test
* Search in archive channels from the API must be explicitly requested
* Removing includeDeleted parameter from GetChannelByName and GetChannelByNameForTeam
* Back to ViewArchivedChannels config
* Fixing tests
* Reverting GetChannelByName parameter
* Add include deleted parameter on GetChannel functions in plugins api
* Fixing tests
Diffstat (limited to 'store/sqlstore/post_store.go')
| -rw-r--r-- | store/sqlstore/post_store.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index 229005b73..90db80796 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -803,6 +803,11 @@ func (s *SqlPostStore) Search(teamId string, userId string, params *model.Search var posts []*model.Post + deletedQueryPart := "AND DeleteAt = 0" + if params.IncludeDeletedChannels { + deletedQueryPart = "" + } + searchQuery := ` SELECT * @@ -822,7 +827,7 @@ func (s *SqlPostStore) Search(teamId string, userId string, params *model.Search Id = ChannelId AND (TeamId = :TeamId OR TeamId = '') AND UserId = :UserId - AND DeleteAt = 0 + ` + deletedQueryPart + ` CHANNEL_FILTER) SEARCH_CLAUSE ORDER BY CreateAt DESC |