diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2016-12-12 20:17:20 +0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-12-12 10:17:20 -0500 |
commit | 32842be3094237d6dffe41b52b24b2d04f85576e (patch) | |
tree | 0125c99465fa4b6b73dbac6d4e25a9467ff3a142 /webapp/components/rhs_root_post.jsx | |
parent | 30a10d35a8406f4af96fcc8200c4e2173856837d (diff) | |
download | chat-32842be3094237d6dffe41b52b24b2d04f85576e.tar.gz chat-32842be3094237d6dffe41b52b24b2d04f85576e.tar.bz2 chat-32842be3094237d6dffe41b52b24b2d04f85576e.zip |
Multiple Ui improvements (#4767)
* PLT-4911 - Adding new target for OAuth help links
* PLT-4953 - Fixing styles for the unread messages indicator
* PLT-4901 - Fixing header modal overlap on mobile
* PLT-4916 - Swapping position of edit and delete
Diffstat (limited to 'webapp/components/rhs_root_post.jsx')
-rw-r--r-- | webapp/components/rhs_root_post.jsx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index d871ad2a9..4a15127a0 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -185,46 +185,46 @@ export default class RhsRootPost extends React.Component { </li> ); - if (isOwner && !isSystemMessage) { + if (isOwner || isAdmin) { dropdownContents.push( <li - key='rhs-root-edit' + key='rhs-root-delete' role='presentation' > <a href='#' role='menuitem' - data-toggle='modal' - data-target='#edit_post' - data-refocusid='#reply_textbox' - data-title={type} - data-message={post.message} - data-postid={post.id} - data-channelid={post.channel_id} + onClick={() => GlobalActions.showDeletePostModal(post, this.props.commentCount)} > <FormattedMessage - id='rhs_root.edit' - defaultMessage='Edit' + id='rhs_root.del' + defaultMessage='Delete' /> </a> </li> ); } - if (isOwner || isAdmin) { + if (isOwner && !isSystemMessage) { dropdownContents.push( <li - key='rhs-root-delete' + key='rhs-root-edit' role='presentation' > <a href='#' role='menuitem' - onClick={() => GlobalActions.showDeletePostModal(post, this.props.commentCount)} + data-toggle='modal' + data-target='#edit_post' + data-refocusid='#reply_textbox' + data-title={type} + data-message={post.message} + data-postid={post.id} + data-channelid={post.channel_id} > <FormattedMessage - id='rhs_root.del' - defaultMessage='Delete' + id='rhs_root.edit' + defaultMessage='Edit' /> </a> </li> |