diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-11-02 08:03:28 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-11-02 08:03:28 -0500 |
commit | ab418ed67ebe6245eaf108145a82939523d3c7f5 (patch) | |
tree | d98e72fb684415545e7b2bb6a67353275389aa8b | |
parent | 2ba0f1fe2c5384e7fa815aa8682f298eddd89985 (diff) | |
parent | 713380df1c5e0015e125d44a2c132523dcacf4d0 (diff) | |
download | chat-ab418ed67ebe6245eaf108145a82939523d3c7f5.tar.gz chat-ab418ed67ebe6245eaf108145a82939523d3c7f5.tar.bz2 chat-ab418ed67ebe6245eaf108145a82939523d3c7f5.zip |
Merge pull request #1222 from rgarmsen2295/plt-550
PLT-550 Fixed various issues with commenting on recently deleted posts
-rw-r--r-- | web/react/components/post_info.jsx | 2 | ||||
-rw-r--r-- | web/react/components/post_list.jsx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 6937ec216..ddda48e06 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -126,7 +126,7 @@ export default class PostInfo extends React.Component { lastCommentClass = ' comment-icon__container__show'; } - if (this.props.commentCount >= 1 && post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING) { + if (this.props.commentCount >= 1 && post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING && post.state !== Constants.POST_DELETED) { comments = ( <a href='#' diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index b9741bac4..444736db5 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -556,6 +556,11 @@ export default class PostList extends React.Component { var post = posts[order[i]]; var parentPost = posts[post.parent_id]; + // If the post is a comment whose parent has been deleted, don't add it to the list. + if (parentPost && parentPost.state === Constants.POST_DELETED) { + continue; + } + var sameUser = false; var sameRoot = false; var hideProfilePic = false; |