From 637bef0c3cd7910d010dce075b8cfae1d98fd519 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 13 Apr 2018 15:10:06 -0400 Subject: [PATCH] UX: staff can see the delete button on a post that was marked for deletion by the author --- app/assets/javascripts/discourse/lib/transform-post.js.es6 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6 index 3aa31c4714..e205dea1d0 100644 --- a/app/assets/javascripts/discourse/lib/transform-post.js.es6 +++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6 @@ -27,7 +27,7 @@ export function transformBasicPost(post) { deleted: post.get('deleted'), deleted_at: post.deleted_at, user_deleted: post.user_deleted, - isDeleted: post.deleted_at || post.user_deleted, + isDeleted: post.deleted_at || post.user_deleted, // xxxxx deletedByAvatarTemplate: null, deletedByUsername: null, primary_group_name: post.primary_group_name, @@ -215,7 +215,8 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos postAtts.expandablePost = topic.expandable_first_post; } else { postAtts.canRecover = postAtts.isDeleted && postAtts.canRecover; - postAtts.canDelete = !postAtts.isDeleted && postAtts.canDelete; + postAtts.canDelete = postAtts.canDelete && !post.deleted_at && + currentUser && (currentUser.staff || !post.user_deleted); } _additionalAttributes.forEach(a => postAtts[a] = post[a]);