IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make channel switcher partially obey RestrictDirectMessage setting (#6830)

Browse Source
This commit is contained in:
Joram Wilander
2017-07-04 04:01:27 -04:00
committed by George Goldberg
parent 04b00e0933
commit 7a09b4bd78
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/components/suggestion/switch_channel_provider.jsx
View File

@@ -121,7 +121,11 @@ export default class SwitchChannelProvider extends Provider {
}
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);
let usersFromServer = [];