From 4e92d1801733410c47bdde29c4bda4d52210d4e7 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 17 Aug 2017 17:14:59 +0800 Subject: set ephemeral message ("message deleted") without ("Only visible to you") visible to users other than the owner (#7201) --- webapp/components/post_view/post_info/post_info.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'webapp/components/post_view') diff --git a/webapp/components/post_view/post_info/post_info.jsx b/webapp/components/post_view/post_info/post_info.jsx index 5f3701761..21492b92f 100644 --- a/webapp/components/post_view/post_info/post_info.jsx +++ b/webapp/components/post_view/post_info/post_info.jsx @@ -11,6 +11,7 @@ import * as Utils from 'utils/utils.jsx'; import * as PostUtils from 'utils/post_utils.jsx'; import {emitEmojiPosted} from 'actions/post_actions.jsx'; import Constants from 'utils/constants.jsx'; +import {Posts} from 'mattermost-redux/constants'; import React from 'react'; import PropTypes from 'prop-types'; @@ -215,7 +216,7 @@ export default class PostInfo extends React.PureComponent { } let visibleMessage; - if (isEphemeral && !this.props.compactDisplay) { + if (isEphemeral && !this.props.compactDisplay && post.state !== Posts.POST_DELETED) { visibleMessage = (