From 35efdb39b30fb64a932f8a71a826ed062cd10d94 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Wed, 4 Apr 2018 18:16:44 +0200 Subject: [PATCH] FEATURE: Show the current reply count of the flagged post --- .../admin/templates/components/flagged-post-title.hbs | 3 +++ app/assets/stylesheets/common/admin/flagging.scss | 4 ++++ config/locales/client.en.yml | 3 +++ lib/flag_query.rb | 1 + 4 files changed, 11 insertions(+) diff --git a/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs index 161a8f9f926..0871c5c6f1d 100644 --- a/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs +++ b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs @@ -3,3 +3,6 @@ {{/if}} {{topic-status topic=flaggedPost.topic}} {{{unbound flaggedPost.topic.fancyTitle}}} +{{#if flaggedPost.reply_count}} + {{i18n 'admin.flags.replies' count=flaggedPost.reply_count}} +{{/if}} diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss index 298826baad0..e4d191678ea 100644 --- a/app/assets/stylesheets/common/admin/flagging.scss +++ b/app/assets/stylesheets/common/admin/flagging.scss @@ -67,6 +67,10 @@ } } + .flagged-post-reply-count { + font-weight: normal; + } + .flag-user-lists { display: flex; align-items: flex-start; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 9d203a325dc..fb144a214bd 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2804,6 +2804,9 @@ en: more: "(more replies...)" suspend_user: "Suspend User" suspend_user_title: "Suspend user for this post" + replies: + one: "[1 reply]" + other: "[%{count} replies]" dispositions: agreed: "agreed" diff --git a/lib/flag_query.rb b/lib/flag_query.rb index cda69b8f913..268e4abef16 100644 --- a/lib/flag_query.rb +++ b/lib/flag_query.rb @@ -35,6 +35,7 @@ module FlagQuery p.user_id, p.topic_id, p.post_number, + p.reply_count, p.hidden, p.deleted_at, p.user_deleted,