summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-04-10 17:21:54 +0100
committerGitHub <noreply@github.com>2017-04-10 17:21:54 +0100
commit9c3b96661bfe358cfad2b7ceb43b40fee6f3c544 (patch)
tree59751a07c1d40cf4a5f4cc2dc47b213846433431 /webapp
parent9fa4712dd7fb2b06cff5f3d6dd37c2ecfba070c5 (diff)
downloadchat-9c3b96661bfe358cfad2b7ceb43b40fee6f3c544.tar.gz
chat-9c3b96661bfe358cfad2b7ceb43b40fee6f3c544.tar.bz2
chat-9c3b96661bfe358cfad2b7ceb43b40fee6f3c544.zip
PLT-6253: Handle demote self from Team Admin. (#6056)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/actions/user_actions.jsx12
-rw-r--r--webapp/components/team_members_dropdown.jsx6
2 files changed, 17 insertions, 1 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx
index 70df4776e..ecbe83feb 100644
--- a/webapp/actions/user_actions.jsx
+++ b/webapp/actions/user_actions.jsx
@@ -953,3 +953,15 @@ export function getMissingProfiles(ids, success, error) {
AsyncClient.getProfilesByIds(missingIds, success, error);
}
+
+export function loadMyTeamMembers() {
+ Client.getMyTeamMembers((data) => {
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_MY_TEAM_MEMBERS,
+ team_members: data
+ });
+ AsyncClient.getMyTeamsUnread();
+ }, (err) => {
+ AsyncClient.dispatchError(err, 'getMyTeamMembers');
+ });
+}
diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx
index f2f7727a3..7d0b645cd 100644
--- a/webapp/components/team_members_dropdown.jsx
+++ b/webapp/components/team_members_dropdown.jsx
@@ -8,7 +8,7 @@ import UserStore from 'stores/user_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import {removeUserFromTeam, updateTeamMemberRoles} from 'actions/team_actions.jsx';
-import {updateActive} from 'actions/user_actions.jsx';
+import {loadMyTeamMembers, updateActive} from 'actions/user_actions.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as Utils from 'utils/utils.jsx';
@@ -49,6 +49,10 @@ export default class TeamMembersDropdown extends React.Component {
'team_user',
() => {
AsyncClient.getUser(this.props.user.id);
+
+ if (this.props.user.id === me.id) {
+ loadMyTeamMembers();
+ }
},
(err) => {
this.setState({serverError: err.message});