IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Multiple cross-team functionality fixes (#2902)

Browse Source
This commit is contained in:
Joram Wilander
2016-05-06 08:06:34 -04:00
committed by Christopher Speller
parent 4b2843ee9d
commit d75cb02948
7 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/stores/notification_store.jsx
View File

@@ -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;
}

2
webapp/stores/user_store.jsx
View File

@@ -111,7 +111,7 @@ class UserStoreClass extends EventEmitter {
}
hasProfile(userId) {
return this.getProfiles()[userId] != null;
return this.getProfile(userId) != null;
}
getProfile(userId) {