summaryrefslogtreecommitdiffstats
path: root/web/react/stores
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-11-11 12:53:18 -0500
committerJoramWilander <jwawilander@gmail.com>2015-11-11 12:53:18 -0500
commit782709aa56d8e3ad9d65cd05f33640887d771b89 (patch)
treeacf53dd7a00cfa083e4226cd97b63ee3cdbbec48 /web/react/stores
parente32b92052e48a37e7989d89d5969ea9a13ca43ae (diff)
downloadchat-782709aa56d8e3ad9d65cd05f33640887d771b89.tar.gz
chat-782709aa56d8e3ad9d65cd05f33640887d771b89.tar.bz2
chat-782709aa56d8e3ad9d65cd05f33640887d771b89.zip
Fix channel invite button on channel intro message and fix empty channel invite modal.
Diffstat (limited to 'web/react/stores')
-rw-r--r--web/react/stores/user_store.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx
index 6b7d671fc..b173c9ca0 100644
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -193,13 +193,13 @@ class UserStoreClass extends EventEmitter {
return BrowserStore.getItem('profiles', {});
}
- getActiveOnlyProfiles() {
+ getActiveOnlyProfiles(skipCurrent) {
const active = {};
const profiles = this.getProfiles();
const currentId = this.getCurrentId();
for (var key in profiles) {
- if (profiles[key].delete_at === 0 && profiles[key].id !== currentId) {
+ if (!(profiles[key].id === currentId && skipCurrent) && profiles[key].delete_at === 0) {
active[key] = profiles[key];
}
}