Merge pull request #2495 from hmhealey/plt2317a

PLT-2317 Changed RhsRootPost and RhsComment to receive current user through props

1 files changed, 3 insertions, 2 deletions

diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index a2c7ee7f8..1aa4a555f 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -55,8 +55,8 @@ export default class RhsRootPost extends React.Component {
     render() {
         const post = this.props.post;
         const user = this.props.user;
-        var isOwner = user.id === post.user_id;
-        var isAdmin = Utils.isAdmin(user.roles);
+        var isOwner = this.props.currentUser.id === post.user_id;
+        var isAdmin = Utils.isAdmin(this.props.currentUser.roles);
         var timestamp = UserStore.getProfile(post.user_id).update_at;
         var channel = ChannelStore.get(post.channel_id);
 
@@ -286,5 +286,6 @@ RhsRootPost.defaultProps = {
 RhsRootPost.propTypes = {
     post: React.PropTypes.object.isRequired,
     user: React.PropTypes.object.isRequired,
+    currentUser: React.PropTypes.object.isRequired,
     commentCount: React.PropTypes.number
 };