diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-02 09:59:01 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-02 09:59:01 -0800 |
commit | ede7d376f269d7b82904fdad79accc7684484ea6 (patch) | |
tree | f9f4650cc03f449fe5dc545b1b3e3ca73f6829b5 /web/react | |
parent | bd9b038c0007eeb3c1d27cae17c25169a04052a8 (diff) | |
parent | 18629d8184a985d9fe9f9bf892952044b1e5d57f (diff) | |
download | chat-ede7d376f269d7b82904fdad79accc7684484ea6.tar.gz chat-ede7d376f269d7b82904fdad79accc7684484ea6.tar.bz2 chat-ede7d376f269d7b82904fdad79accc7684484ea6.zip |
Merge pull request #120 from mattermost/get-teammate-fix
fix getDirectTeammate so that if teammate is the second id it doesn't return null
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/utils/utils.jsx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 530166f04..f8a7d6450 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -728,20 +728,22 @@ module.exports.isComment = function(post) { } module.exports.getDirectTeammate = function(channel_id) { - var userIds = ChannelStore.get(channel_id).name.split('__'); + var userIds = ChannelStore.get(channel_id).name.split('__'); + var curUserId = UserStore.getCurrentId(); + var teammate = {}; - if(userIds.length != 2) { - return; - } - - var curUser = UserStore.getCurrentId(); + if(userIds.length != 2 || userIds.indexOf(curUserId) === -1) { + return teammate; + } - for(var idx in userIds) { - if(userIds[idx] === curUser) - delete userIds[idx]; - } + for (var idx in userIds) { + if(userIds[idx] !== curUserId) { + teammate = UserStore.getProfile(userIds[idx]); + break; + } + } - return UserStore.getProfile(userIds[0]) + return teammate; } Image.prototype.load = function(url, progressCallback) { |