MM-27407 Return archived channels even if view archived config is false for sysadmin endpoints (#15149)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Farhan Munshi
2020-08-04 02:32:12 -04:00
коммит произвёл GitHub
родитель 339c5bae76
Коммит d4dac31b04
2 изменённых файлов: 0 добавлений и 15 удалений

Просмотреть файл

@@ -1570,7 +1570,6 @@ func (a *App) GetChannelsForUser(teamId string, userId string, includeDeleted bo
}
func (a *App) GetAllChannels(page, perPage int, opts model.ChannelSearchOpts) (*model.ChannelListWithTeamData, *model.AppError) {
opts.IncludeDeleted = *a.Config().TeamSettings.ExperimentalViewArchivedChannels && opts.IncludeDeleted
if opts.ExcludeDefaultChannels {
opts.ExcludeChannelNames = a.DefaultChannelNames()
}
@@ -2187,7 +2186,6 @@ func (a *App) AutocompleteChannelsForSearch(teamId string, userId string, term s
// SearchAllChannels returns a list of channels, the total count of the results of the search (if the paginate search option is true), and an error.
func (a *App) SearchAllChannels(term string, opts model.ChannelSearchOpts) (*model.ChannelListWithTeamData, int64, *model.AppError) {
opts.IncludeDeleted = *a.Config().TeamSettings.ExperimentalViewArchivedChannels && opts.IncludeDeleted
if opts.ExcludeDefaultChannels {
opts.ExcludeChannelNames = a.DefaultChannelNames()
}