summaryrefslogtreecommitdiffstats
path: root/webapp/components/post_view
diff options
context:
space:
mode:
authorAlexander Smaga <smagaan@gmail.com>2016-10-12 16:59:03 +0300
committerHarrison Healey <harrisonmhealey@gmail.com>2016-10-12 09:59:03 -0400
commit3a369c9de8b2356fbbdc86d0d6eae8df3fd7e980 (patch)
tree79d310faca4bf2015892d004ce80150591e04758 /webapp/components/post_view
parent39eee5e4ec5274186cdcb0cbff0155b63dde4e5a (diff)
downloadchat-3a369c9de8b2356fbbdc86d0d6eae8df3fd7e980.tar.gz
chat-3a369c9de8b2356fbbdc86d0d6eae8df3fd7e980.tar.bz2
chat-3a369c9de8b2356fbbdc86d0d6eae8df3fd7e980.zip
GH-4187 Turn off dot menu for system messages (#4198)
Diffstat (limited to 'webapp/components/post_view')
-rw-r--r--webapp/components/post_view/components/post_info.jsx5
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/post_view/components/post_info.jsx b/webapp/components/post_view/components/post_info.jsx
index c95a121da..61cb103e3 100644
--- a/webapp/components/post_view/components/post_info.jsx
+++ b/webapp/components/post_view/components/post_info.jsx
@@ -12,6 +12,7 @@ import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import * as Utils from 'utils/utils.jsx';
+import * as PostUtils from 'utils/post_utils.jsx';
import Constants from 'utils/constants.jsx';
import {Tooltip, OverlayTrigger} from 'react-bootstrap';
@@ -48,7 +49,7 @@ export default class PostInfo extends React.Component {
var isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser();
const isSystemMessage = post.type && post.type.startsWith(Constants.SYSTEM_MESSAGE_PREFIX);
- if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING || Utils.isPostEphemeral(post)) {
+ if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) {
return '';
}
@@ -282,7 +283,7 @@ export default class PostInfo extends React.Component {
{this.createRemovePostButton()}
</li>
);
- } else {
+ } else if (!PostUtils.isSystemMessage(post)) {
options = (
<li className='col col__reply'>
<div