diff options
author | Florian Orben <florian.orben@gmail.com> | 2015-12-04 02:07:47 +0100 |
---|---|---|
committer | Florian Orben <florian.orben@gmail.com> | 2015-12-04 02:07:47 +0100 |
commit | 14d1ec5191867174837e15f616ad3fc1dc8e0dae (patch) | |
tree | cc74c752199a42b3e273570586eb5abd3bc41581 /web/react/components/user_profile.jsx | |
parent | d5d66214db6c108eb94cf2e43c0c4538cdb5d7ae (diff) | |
download | chat-14d1ec5191867174837e15f616ad3fc1dc8e0dae.tar.gz chat-14d1ec5191867174837e15f616ad3fc1dc8e0dae.tar.bz2 chat-14d1ec5191867174837e15f616ad3fc1dc8e0dae.zip |
PLT-1326: Enable channel posts of type join or leave not trigger unread notifications
Diffstat (limited to 'web/react/components/user_profile.jsx')
-rw-r--r-- | web/react/components/user_profile.jsx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index ea104fedb..385cd0f52 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -65,11 +65,16 @@ export default class UserProfile extends React.Component { return <div>{name}</div>; } + var profileImg = '/api/v1/users/' + this.state.profile.id + '/image?time=' + this.state.profile.update_at + '&' + Utils.getSessionIndex(); + if (this.props.overwriteImage) { + profileImg = this.props.overwriteImage; + } + var dataContent = []; dataContent.push( <img className='user-popover__image' - src={'/api/v1/users/' + this.state.profile.id + '/image?time=' + this.state.profile.update_at + '&' + Utils.getSessionIndex()} + src={profileImg} height='128' width='128' key='user-popover-image' @@ -130,10 +135,12 @@ export default class UserProfile extends React.Component { UserProfile.defaultProps = { userId: '', overwriteName: '', + overwriteImage: '', disablePopover: false }; UserProfile.propTypes = { userId: React.PropTypes.string, overwriteName: React.PropTypes.string, + overwriteImage: React.PropTypes.string, disablePopover: React.PropTypes.bool }; |