Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: staff can see the delete button on a post that was marked for deletion by the author

This commit is contained in:
Neil Lalonde 2018-04-13 15:10:06 -04:00
parent 9d0ff0dc68
commit 637bef0c3c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/lib/transform-post.js.es6
View File

@ -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]);