From cd2e93b59882f908a670877f5aa904842928ba7f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 17 Apr 2019 16:14:36 -0400 Subject: [PATCH] FIX: Show when a post has been deleted in the flag review queue --- .../templates/components/reviewable-flagged-post.hbs | 6 +++++- app/serializers/reviewable_flagged_post_serializer.rb | 9 +++++++++ config/locales/client.en.yml | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs index 10d1cba4dc5..d79d8a206a0 100644 --- a/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs +++ b/app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs @@ -5,7 +5,11 @@
{{reviewable-created-by-name user=reviewable.target_created_by tagName=''}}
- {{{reviewable.cooked}}} + {{#if reviewable.blank_post}} +

{{i18n "review.deleted_post"}}

+ {{else}} + {{{reviewable.cooked}}} + {{/if}}
{{yield}}
diff --git a/app/serializers/reviewable_flagged_post_serializer.rb b/app/serializers/reviewable_flagged_post_serializer.rb index 3b8e1c73473..1a85940dd89 100644 --- a/app/serializers/reviewable_flagged_post_serializer.rb +++ b/app/serializers/reviewable_flagged_post_serializer.rb @@ -1,3 +1,12 @@ class ReviewableFlaggedPostSerializer < ReviewableSerializer target_attributes :cooked, :raw, :reply_count + attributes :blank_post + + def blank_post + true + end + + def include_blank_post? + object.target.blank? + end end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 5982db56964..e4af071525e 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -382,7 +382,8 @@ en: filtered_topic: "You have filtered to reviewable content in a single topic." filtered_user: "User:" show_all_topics: "show all topics" - deleted_user: "(deleted user)" + deleted_post: "(post deleted)" + deleted_user: "(user deleted)" user: username: "Username" email: "Email"