diff options
| author | George Goldberg <george@gberg.me> | 2018-08-22 20:12:51 +0100 |
|---|---|---|
| committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-08-22 21:12:51 +0200 |
| commit | d2945cdd77bdf1ee03367a0d45624094fb936c19 (patch) | |
| tree | 7289f0a5d85b7c37e1fe5bf02cb40ab30623d0fa /app/channel.go | |
| parent | 43483805eabcb36ef9018f12a82a6d3ac055baf5 (diff) | |
| download | chat-d2945cdd77bdf1ee03367a0d45624094fb936c19.tar.gz chat-d2945cdd77bdf1ee03367a0d45624094fb936c19.tar.bz2 chat-d2945cdd77bdf1ee03367a0d45624094fb936c19.zip | |
MM-11782: Make archived channels experimental and off-by-default. (#9281)
* MM-11782: Make archived channels experimental and off-by-default.
* Fix test.
Diffstat (limited to 'app/channel.go')
| -rw-r--r-- | app/channel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/channel.go b/app/channel.go index 4dcab83ee..535eff724 100644 --- a/app/channel.go +++ b/app/channel.go @@ -1498,7 +1498,7 @@ func (a *App) UpdateChannelLastViewedAt(channelIds []string, userId string) *mod } func (a *App) AutocompleteChannels(teamId string, term string) (*model.ChannelList, *model.AppError) { - includeDeleted := *a.Config().TeamSettings.ViewArchivedChannels + includeDeleted := *a.Config().TeamSettings.ExperimentalViewArchivedChannels if result := <-a.Srv.Store.Channel().AutocompleteInTeam(teamId, term, includeDeleted); result.Err != nil { return nil, result.Err @@ -1508,7 +1508,7 @@ func (a *App) AutocompleteChannels(teamId string, term string) (*model.ChannelLi } func (a *App) SearchChannels(teamId string, term string) (*model.ChannelList, *model.AppError) { - includeDeleted := *a.Config().TeamSettings.ViewArchivedChannels + includeDeleted := *a.Config().TeamSettings.ExperimentalViewArchivedChannels if result := <-a.Srv.Store.Channel().SearchInTeam(teamId, term, includeDeleted); result.Err != nil { return nil, result.Err |