Make channel switcher partially obey RestrictDirectMessage setting (#6830)
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
04b00e0933
Коммит
7a09b4bd78
@@ -121,7 +121,11 @@ export default class SwitchChannelProvider extends Provider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fetchUsersAndChannels(channelPrefix, suggestionId) {
|
async fetchUsersAndChannels(channelPrefix, suggestionId) {
|
||||||
const usersAsync = Client4.autocompleteUsers(channelPrefix, '', '');
|
let teamId = '';
|
||||||
|
if (global.window.mm_config.RestrictDirectMessage === 'team') {
|
||||||
|
teamId = store.getState().entities.teams.currentTeamId;
|
||||||
|
}
|
||||||
|
const usersAsync = Client4.autocompleteUsers(channelPrefix, teamId, '');
|
||||||
const channelsAsync = Client4.searchChannels(getCurrentTeamId(getState()), channelPrefix);
|
const channelsAsync = Client4.searchChannels(getCurrentTeamId(getState()), channelPrefix);
|
||||||
|
|
||||||
let usersFromServer = [];
|
let usersFromServer = [];
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user