diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
| commit | e017babc5ddd66e65469326bf723d5359875c2d1 (patch) | |
| tree | 0da7ee5d9f4039eeb20f70940483c40943c9aa23 /web/react/components/post_right.jsx | |
| parent | 252d0f3924dd19aa4dd1900c6c00c41c84755d1e (diff) | |
| parent | 38f9e140e98123eb256968fb31f7fbb2aef978e0 (diff) | |
| download | chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.gz chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.bz2 chat-e017babc5ddd66e65469326bf723d5359875c2d1.zip | |
fixing merge
Diffstat (limited to 'web/react/components/post_right.jsx')
| -rw-r--r-- | web/react/components/post_right.jsx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 115ee87d4..408fbf83a 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -67,6 +67,7 @@ RootPost = React.createClass({ var message = utils.textToJsx(this.props.post.message); var filenames = this.props.post.filenames; var isOwner = UserStore.getCurrentId() == this.props.post.user_id; + var timestamp = UserStore.getProfile(this.props.post.user_id).update_at; var type = "Post"; if (this.props.post.root_id.length > 0) { @@ -118,7 +119,7 @@ RootPost = React.createClass({ return ( <div className={"post post--root " + currentUserCss}> <div className="post-profile-img__container"> - <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" /> + <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" /> </div> <div className="post__content"> <ul className="post-header"> @@ -227,11 +228,12 @@ CommentPost = React.createClass({ } var message = utils.textToJsx(this.props.post.message); + var timestamp = UserStore.getCurrentUser().update_at; return ( <div className={commentClass + " " + currentUserCss}> <div className="post-profile-img__container"> - <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" /> + <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" /> </div> <div className="post__content"> <ul className="post-header"> |