diff options
author | Corey Hulen <corey@hulen.com> | 2015-12-04 11:30:50 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-12-04 11:30:50 -0800 |
commit | 1bee1e06e4d0110db274c076860fa97f76471ddb (patch) | |
tree | 8f971b54319ae90246ad13905851df545bbb7b89 /web/react/components/user_profile.jsx | |
parent | 1d67f26664f8cf98f52433ef8b081b6fb485eadb (diff) | |
parent | 14d1ec5191867174837e15f616ad3fc1dc8e0dae (diff) | |
download | chat-1bee1e06e4d0110db274c076860fa97f76471ddb.tar.gz chat-1bee1e06e4d0110db274c076860fa97f76471ddb.tar.bz2 chat-1bee1e06e4d0110db274c076860fa97f76471ddb.zip |
Merge pull request #1613 from florianorben/PLT-1326
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 }; |