summaryrefslogtreecommitdiffstats
path: root/web/react/components/search_results_item.jsx
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2016-02-24 07:59:33 -0500
committerJoramWilander <jwawilander@gmail.com>2016-02-24 07:59:33 -0500
commitab72afdeabf0f93bc0bb9e4e9a124114b6baaac1 (patch)
tree87ef0bccd65578d1867a6a330ae38a87910fd54a /web/react/components/search_results_item.jsx
parent52767d9dcdc84fca4cd7a5b5c7ece2650691b91d (diff)
downloadchat-ab72afdeabf0f93bc0bb9e4e9a124114b6baaac1.tar.gz
chat-ab72afdeabf0f93bc0bb9e4e9a124114b6baaac1.tar.bz2
chat-ab72afdeabf0f93bc0bb9e4e9a124114b6baaac1.zip
Fix profiles issue with RHS
Diffstat (limited to 'web/react/components/search_results_item.jsx')
-rw-r--r--web/react/components/search_results_item.jsx8
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