summaryrefslogtreecommitdiffstats
path: root/webapp/stores
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-22 06:36:46 -0400
committerGeorge Goldberg <george@gberg.me>2017-06-22 11:36:46 +0100
commit3f1fca9463df27e8f795356ab6873d0d5bf4d634 (patch)
treeeb023486f6bac6a8156633fcc6adb5f4bd360583 /webapp/stores
parentac4e9909fa4f3f6c6a0d1e537d6039115d07a5e0 (diff)
downloadchat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.gz
chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.bz2
chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.zip
PLT-6759 Show deactivated users in GMs (#6703)
* Show deactivated users in GMs * Fix runtime error when DMing deactivated user
Diffstat (limited to 'webapp/stores')
-rw-r--r--webapp/stores/user_store.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx
index b6e867443..79052d77e 100644
--- a/webapp/stores/user_store.jsx
+++ b/webapp/stores/user_store.jsx
@@ -390,10 +390,10 @@ class UserStoreClass extends EventEmitter {
});
}
- getProfileListInChannel(channelId = ChannelStore.getCurrentId(), skipCurrent = false) {
+ getProfileListInChannel(channelId = ChannelStore.getCurrentId(), skipCurrent = false, skipInactive = false) {
const userIds = Array.from(Selectors.getUserIdsInChannels(store.getState())[channelId] || []);
- return this.getProfileListForIds(userIds, skipCurrent, false);
+ return this.getProfileListForIds(userIds, skipCurrent, skipInactive);
}
saveProfileNotInChannel(channelId = ChannelStore.getCurrentId(), profile) {