diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-17 17:14:59 +0800 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-08-17 10:14:59 +0100 |
| commit | 4e92d1801733410c47bdde29c4bda4d52210d4e7 (patch) | |
| tree | dffafdeed193e213f5249605f1467625e202eaf8 /webapp/components/post_view | |
| parent | f80d50adbddf55a043dfcab5b47d7c1e22749b7d (diff) | |
| download | chat-4e92d1801733410c47bdde29c4bda4d52210d4e7.tar.gz chat-4e92d1801733410c47bdde29c4bda4d52210d4e7.tar.bz2 chat-4e92d1801733410c47bdde29c4bda4d52210d4e7.zip | |
set ephemeral message ("message deleted") without ("Only visible to you") visible to users other than the owner (#7201)
Diffstat (limited to 'webapp/components/post_view')
| -rw-r--r-- | webapp/components/post_view/post_info/post_info.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
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 = ( <span className='post__visibility'> <FormattedMessage |