Merge pull request #945 from mattermost/plt-433

PLT-433 Allow team admin to delete comments.

1 files changed, 4 insertions, 10 deletions

diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index dba75ac5f..c1e8979a4 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -13,12 +13,6 @@ export default class PostInfo extends React.Component {
         super(props);
         this.state = {};
     }
-    shouldShowComment(state, type, isOwner) {
-        if (state === Constants.POST_FAILED || state === Constants.POST_LOADING) {
-            return false;
-        }
-        return isOwner || (this.props.allowReply === 'true' && type !== 'Comment');
-    }
     createDropdown() {
         var post = this.props.post;
         var isOwner = UserStore.getCurrentId() === post.user_id;
@@ -33,10 +27,6 @@ export default class PostInfo extends React.Component {
             type = 'Comment';
         }
 
-        if (!this.shouldShowComment(post.state, type, isOwner)) {
-            return '';
-        }
-
         var dropdownContents = [];
         var dataComments = 0;
         if (type === 'Post') {
@@ -106,6 +96,10 @@ export default class PostInfo extends React.Component {
             );
         }
 
+        if (dropdownContents.length === 0) {
+            return '';
+        }
+
         return (
             <div>
                 <a