summaryrefslogtreecommitdiffstats
path: root/web/react/components/post_header.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-14 00:56:37 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-14 00:56:37 -0400
commit975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165 (patch)
treea0852f9faf6de9962b5478ed3f1bbaccd71062c0 /web/react/components/post_header.jsx
parent160e1a8bea6d8280ef3b41a4a9f80674b75f3eb0 (diff)
parentd7cdcf082fab6c0cb7c2fe4bed821bd1a8000e69 (diff)
downloadchat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.tar.gz
chat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.tar.bz2
chat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.zip
Merge pull request #2331 from mattermost/plt-1680
PLT-1680 Converting client to react-router. Stage 1
Diffstat (limited to 'web/react/components/post_header.jsx')
-rw-r--r--web/react/components/post_header.jsx17
1 files changed, 9 insertions, 8 deletions
diff --git a/web/react/components/post_header.jsx b/web/react/components/post_header.jsx
index 2803fe387..966775dad 100644
--- a/web/react/components/post_header.jsx
+++ b/web/react/components/post_header.jsx
@@ -14,16 +14,15 @@ export default class PostHeader extends React.Component {
}
render() {
const post = this.props.post;
- const user = this.props.user;
- let userProfile = <UserProfile user={user}/>;
+ let userProfile = <UserProfile user={this.props.user}/>;
let botIndicator;
if (post.props && post.props.from_webhook) {
if (post.props.override_username && global.window.mm_config.EnablePostUsernameOverride === 'true') {
userProfile = (
<UserProfile
- user={user}
+ user={this.props.user}
overwriteName={post.props.override_username}
disablePopover={true}
/>
@@ -54,6 +53,7 @@ export default class PostHeader extends React.Component {
allowReply='true'
isLastComment={this.props.isLastComment}
sameUser={this.props.sameUser}
+ currentUser={this.props.currentUser}
/>
</li>
</ul>
@@ -68,10 +68,11 @@ PostHeader.defaultProps = {
sameUser: false
};
PostHeader.propTypes = {
- post: React.PropTypes.object,
+ post: React.PropTypes.object.isRequired,
user: React.PropTypes.object,
- commentCount: React.PropTypes.number,
- isLastComment: React.PropTypes.bool,
- handleCommentClick: React.PropTypes.func,
- sameUser: React.PropTypes.bool
+ currentUser: React.PropTypes.object.isRequired,
+ commentCount: React.PropTypes.number.isRequired,
+ isLastComment: React.PropTypes.bool.isRequired,
+ handleCommentClick: React.PropTypes.func.isRequired,
+ sameUser: React.PropTypes.bool.isRequired
};