diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/post_view/components/post_info.jsx | 5 | ||||
-rw-r--r-- | webapp/components/rhs_comment.jsx | 11 |
2 files changed, 7 insertions, 9 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 diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 938740520..c22e0c4dc 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -100,13 +100,12 @@ export default class RhsComment extends React.Component { createDropdown() { const post = this.props.post; - if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING || post.state === Constants.POST_DELETED) { + if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) { return ''; } const isOwner = this.props.currentUser.id === post.user_id; var isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser(); - const isSystemMessage = post.type && post.type.startsWith(Constants.SYSTEM_MESSAGE_PREFIX); var dropdownContents = []; @@ -165,7 +164,7 @@ export default class RhsComment extends React.Component { </li> ); - if (isOwner && !isSystemMessage) { + if (isOwner) { dropdownContents.push( <li role='presentation' @@ -294,8 +293,6 @@ export default class RhsComment extends React.Component { profilePicContainer = ''; } - var dropdown = this.createDropdown(); - let fileAttachment = null; if (post.file_ids && post.file_ids.length > 0) { fileAttachment = ( @@ -371,10 +368,10 @@ export default class RhsComment extends React.Component { {this.createRemovePostButton()} </li> ); - } else { + } else if (!PostUtils.isSystemMessage(post)) { options = ( <li className='col col__reply'> - {dropdown} + {this.createDropdown()} </li> ); } |