diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-02-24 08:10:55 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-02-24 08:10:55 -0500 |
commit | 940b706ac8a790db9f089e000489d89426915fc9 (patch) | |
tree | 87ef0bccd65578d1867a6a330ae38a87910fd54a /web/react/components/search_results_item.jsx | |
parent | 52767d9dcdc84fca4cd7a5b5c7ece2650691b91d (diff) | |
parent | ab72afdeabf0f93bc0bb9e4e9a124114b6baaac1 (diff) | |
download | chat-940b706ac8a790db9f089e000489d89426915fc9.tar.gz chat-940b706ac8a790db9f089e000489d89426915fc9.tar.bz2 chat-940b706ac8a790db9f089e000489d89426915fc9.zip |
Merge pull request #2239 from mattermost/rhs-fix
Fix profiles issue with RHS
Diffstat (limited to 'web/react/components/search_results_item.jsx')
-rw-r--r-- | web/react/components/search_results_item.jsx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index 3363c97f7..05292b7b3 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -36,9 +36,10 @@ export default class SearchResultsItem extends React.Component { } render() { - var channelName = null; + let channelName = null; const channel = this.props.channel; - var timestamp = UserStore.getCurrentUser().update_at; + const timestamp = UserStore.getCurrentUser().update_at; + const user = this.props.user || {}; if (channel) { channelName = channel.display_name; @@ -84,7 +85,7 @@ export default class SearchResultsItem extends React.Component { </div> <div> <ul className='post__header'> - <li className='col__name'><strong><UserProfile userId={this.props.post.user_id}/></strong></li> + <li className='col__name'><strong><UserProfile user={user}/></strong></li> <li className='col'> <time className='search-item-time'> <FormattedDate @@ -135,6 +136,7 @@ export default class SearchResultsItem extends React.Component { SearchResultsItem.propTypes = { post: React.PropTypes.object, + user: React.PropTypes.object, channel: React.PropTypes.object, isMentionSearch: React.PropTypes.bool, term: React.PropTypes.string |