summaryrefslogtreecommitdiffstats
path: root/webapp/actions/user_actions.jsx
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-01-18 20:54:49 +0000
committerenahum <nahumhbl@gmail.com>2017-01-18 17:54:48 -0300
commite15ae2253a15c7951c31ce0a2f9eea188ba2b639 (patch)
tree5d832b2f33f3e0ba81142d09968473262c8695d4 /webapp/actions/user_actions.jsx
parent2554ae4a253dfe0e66d79a2955fccdb7db041b4b (diff)
downloadchat-e15ae2253a15c7951c31ce0a2f9eea188ba2b639.tar.gz
chat-e15ae2253a15c7951c31ce0a2f9eea188ba2b639.tar.bz2
chat-e15ae2253a15c7951c31ce0a2f9eea188ba2b639.zip
PLT-5050 (WebApp): Change channel member roles. (#5076)
Admins can now Promote/Demote channel members in the Channel Manage Membersmodal.
Diffstat (limited to 'webapp/actions/user_actions.jsx')
-rw-r--r--webapp/actions/user_actions.jsx35
1 files changed, 3 insertions, 32 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx
index f51b11692..76879b5f5 100644
--- a/webapp/actions/user_actions.jsx
+++ b/webapp/actions/user_actions.jsx
@@ -8,6 +8,7 @@ import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
+import {getChannelMembersForUserIds} from 'actions/channel_actions.jsx';
import {loadStatusesForProfilesList, loadStatusesForProfilesMap} from 'actions/status_actions.jsx';
import {getDirectChannelName} from 'utils/utils.jsx';
@@ -180,7 +181,7 @@ export function loadChannelMembersForProfilesMap(profiles, channelId = ChannelSt
return;
}
- loadChannelMembersForProfiles(list, channelId, success, error);
+ getChannelMembersForUserIds(channelId, list, success, error);
}
export function loadTeamMembersAndChannelMembersForProfilesList(profiles, teamId = TeamStore.getCurrentId(), channelId = ChannelStore.getCurrentId(), success, error) {
@@ -207,37 +208,7 @@ export function loadChannelMembersForProfilesList(profiles, channelId = ChannelS
return;
}
- loadChannelMembersForProfiles(list, channelId, success, error);
-}
-
-function loadChannelMembersForProfiles(userIds, channelId, success, error) {
- Client.getChannelMembersByIds(
- channelId,
- userIds,
- (data) => {
- const memberMap = {};
- for (let i = 0; i < data.length; i++) {
- memberMap[data[i].user_id] = data[i];
- }
-
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_MEMBERS_IN_CHANNEL,
- channel_id: channelId,
- channel_members: memberMap
- });
-
- if (success) {
- success(data);
- }
- },
- (err) => {
- AsyncClient.dispatchError(err, 'getChannelMembersByIds');
-
- if (error) {
- error(err);
- }
- }
- );
+ getChannelMembersForUserIds(channelId, list, success, error);
}
function populateDMChannelsWithProfiles(userIds) {