diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-05-06 08:06:34 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-06 08:06:34 -0400 |
commit | d75cb0294896e0e45f280cbccde8581376d501ce (patch) | |
tree | 0d82a1d959945aa2a2e73633233d9c681212f209 /webapp/stores | |
parent | 4b2843ee9d513a6b464e1e581e9cee8baaaa4317 (diff) | |
download | chat-d75cb0294896e0e45f280cbccde8581376d501ce.tar.gz chat-d75cb0294896e0e45f280cbccde8581376d501ce.tar.bz2 chat-d75cb0294896e0e45f280cbccde8581376d501ce.zip |
Multiple cross-team functionality fixes (#2902)
Diffstat (limited to 'webapp/stores')
-rw-r--r-- | webapp/stores/notification_store.jsx | 2 | ||||
-rw-r--r-- | webapp/stores/user_store.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/stores/notification_store.jsx b/webapp/stores/notification_store.jsx index 6722af281..7d7039780 100644 --- a/webapp/stores/notification_store.jsx +++ b/webapp/stores/notification_store.jsx @@ -43,7 +43,7 @@ class NotificationStoreClass extends EventEmitter { if (notifyLevel === 'none') { return; - } else if (notifyLevel === 'mention' && mentions.indexOf(user.id) === -1 && channel.type !== Constants.DM_CHANNEL) { + } else if (notifyLevel === 'mention' && mentions.indexOf(user.id) === -1 && msgProps.channel_type !== Constants.DM_CHANNEL) { return; } diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx index 5a27d15ea..2d792fa17 100644 --- a/webapp/stores/user_store.jsx +++ b/webapp/stores/user_store.jsx @@ -111,7 +111,7 @@ class UserStoreClass extends EventEmitter { } hasProfile(userId) { - return this.getProfiles()[userId] != null; + return this.getProfile(userId) != null; } getProfile(userId) { |