Fix inactive users showing up in team members modal (#6260)
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
224ddb35cf
Коммит
83bfd95f65
@@ -629,10 +629,7 @@ export function checkMfa(loginId, success, error) {
|
|||||||
export function updateActive(userId, active, success, error) {
|
export function updateActive(userId, active, success, error) {
|
||||||
Client.updateActive(userId, active,
|
Client.updateActive(userId, active,
|
||||||
(data) => {
|
(data) => {
|
||||||
AppDispatcher.handleServerAction({
|
UserStore.saveProfile(data);
|
||||||
type: ActionTypes.RECEIVED_PROFILE,
|
|
||||||
profile: data
|
|
||||||
});
|
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
success(data);
|
success(data);
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export default class MemberListTeam extends React.Component {
|
|||||||
this.state = {
|
this.state = {
|
||||||
users: UserStore.getProfileListInTeam(),
|
users: UserStore.getProfileListInTeam(),
|
||||||
teamMembers: Object.assign([], TeamStore.getMembersInTeam()),
|
teamMembers: Object.assign([], TeamStore.getMembersInTeam()),
|
||||||
total: stats.total_member_count,
|
total: stats.active_member_count,
|
||||||
loading: true
|
loading: true
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -83,7 +83,7 @@ export default class MemberListTeam extends React.Component {
|
|||||||
|
|
||||||
onStatsChange() {
|
onStatsChange() {
|
||||||
const stats = TeamStore.getCurrentStats();
|
const stats = TeamStore.getCurrentStats();
|
||||||
this.setState({total: stats.total_member_count});
|
this.setState({total: stats.active_member_count});
|
||||||
}
|
}
|
||||||
|
|
||||||
nextPage(page) {
|
nextPage(page) {
|
||||||
@@ -141,7 +141,7 @@ export default class MemberListTeam extends React.Component {
|
|||||||
for (let i = 0; i < users.length; i++) {
|
for (let i = 0; i < users.length; i++) {
|
||||||
const user = users[i];
|
const user = users[i];
|
||||||
|
|
||||||
if (teamMembers[user.id]) {
|
if (teamMembers[user.id] && user.delete_at === 0) {
|
||||||
usersToDisplay.push(user);
|
usersToDisplay.push(user);
|
||||||
actionUserProps[user.id] = {
|
actionUserProps[user.id] = {
|
||||||
teamMember: teamMembers[user.id]
|
teamMember: teamMembers[user.id]
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user