diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-12 14:55:52 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-12 14:55:52 -0500 |
| commit | c7fe8510ce663feb26056b34fd18c0e833eb3573 (patch) | |
| tree | 0367dc560667b65a9a5a7011fa277af8aecd5c0e /web/react/stores | |
| parent | 931f4f764cbd18f1f5189e03ece83685e4dc6ffa (diff) | |
| parent | 10901b4d50db171fa83e0c289d0eb34f4422f156 (diff) | |
| download | chat-c7fe8510ce663feb26056b34fd18c0e833eb3573.tar.gz chat-c7fe8510ce663feb26056b34fd18c0e833eb3573.tar.bz2 chat-c7fe8510ce663feb26056b34fd18c0e833eb3573.zip | |
Merge branch 'release-1.2'
Diffstat (limited to 'web/react/stores')
| -rw-r--r-- | web/react/stores/user_store.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index e0ecc37aa..40b64b34b 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -197,13 +197,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]; } } |