diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-21 13:11:03 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-21 13:11:03 -0400 |
commit | 21bbd6bae56b23ec25167520e42a8d771e047092 (patch) | |
tree | af18353b3bdc745ba0d77c6e481b4ba770643f53 /webapp | |
parent | bb16a71d6eb77c8035c7b1672aa1d5bc8ed7045e (diff) | |
download | chat-21bbd6bae56b23ec25167520e42a8d771e047092.tar.gz chat-21bbd6bae56b23ec25167520e42a8d771e047092.tar.bz2 chat-21bbd6bae56b23ec25167520e42a8d771e047092.zip |
Changed RhsComment to receive the current user through props
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/rhs_comment.jsx | 12 | ||||
-rw-r--r-- | webapp/components/rhs_thread.jsx | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 29986d415..de99eb37d 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -5,7 +5,6 @@ import ReactDOM from 'react-dom'; import PostStore from 'stores/post_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import UserProfile from './user_profile.jsx'; -import UserStore from 'stores/user_store.jsx'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; @@ -97,8 +96,8 @@ class RhsComment extends React.Component { return ''; } - var isOwner = UserStore.getCurrentId() === post.user_id; - var isAdmin = Utils.isAdmin(UserStore.getCurrentUser().roles); + const isOwner = this.props.currentUser.id === post.user_id; + const isAdmin = Utils.isAdmin(this.props.currentUser.roles); var dropdownContents = []; @@ -193,11 +192,11 @@ class RhsComment extends React.Component { var post = this.props.post; var currentUserCss = ''; - if (UserStore.getCurrentId() === post.user_id) { + if (this.props.currentUser === post.user_id) { currentUserCss = 'current--user'; } - var timestamp = UserStore.getCurrentUser().update_at; + var timestamp = this.props.currentUser.update_at; let loading; let postClass = ''; @@ -305,7 +304,8 @@ RhsComment.defaultProps = { RhsComment.propTypes = { intl: intlShape.isRequired, post: React.PropTypes.object, - user: React.PropTypes.object + user: React.PropTypes.object.isRequired, + currentUser: React.PropTypes.object.isRequired }; export default injectIntl(RhsComment); diff --git a/webapp/components/rhs_thread.jsx b/webapp/components/rhs_thread.jsx index ca950e2dc..2760765eb 100644 --- a/webapp/components/rhs_thread.jsx +++ b/webapp/components/rhs_thread.jsx @@ -198,6 +198,7 @@ export default class RhsThread extends React.Component { key={comPost.id + 'commentKey'} post={comPost} user={p} + currentUser={this.props.currentUser} /> ); })} |