From c7e0b496ba29540881b3ab98365f77454b3f0eb6 Mon Sep 17 00:00:00 2001 From: Jacob Herrington Date: Mon, 12 Apr 2021 12:03:11 -0500 Subject: [PATCH] Add open reports count to admin overview (#13346) * Add open reports count * Conditionally pluralize open reports copy * Add new scope to FeedbackMessage --- app/controllers/admin/overview_controller.rb | 5 ++++- app/models/feedback_message.rb | 2 ++ app/views/admin/overview/index.html.erb | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/overview_controller.rb b/app/controllers/admin/overview_controller.rb index f74d83342..035608a34 100644 --- a/app/controllers/admin/overview_controller.rb +++ b/app/controllers/admin/overview_controller.rb @@ -1,6 +1,9 @@ module Admin class OverviewController < Admin::ApplicationController layout "admin" - def index; end + def index + @open_abuse_reports_count = + FeedbackMessage.open_abuse_reports.size + end end end diff --git a/app/models/feedback_message.rb b/app/models/feedback_message.rb index 2527fedda..71ec5321d 100644 --- a/app/models/feedback_message.rb +++ b/app/models/feedback_message.rb @@ -13,6 +13,8 @@ class FeedbackMessage < ApplicationRecord CATEGORIES = ["spam", "other", "rude or vulgar", "harassment", "bug", "listings"].freeze STATUSES = %w[Open Invalid Resolved].freeze + scope :open_abuse_reports, -> { where(status: "Open", feedback_type: "abuse-reports") } + validates :feedback_type, :message, presence: true validates :reported_url, :category, presence: { if: :abuse_report? }, length: { maximum: 250 } validates :message, length: { maximum: 2500 } diff --git a/app/views/admin/overview/index.html.erb b/app/views/admin/overview/index.html.erb index 0d88aae06..52dbf3623 100644 --- a/app/views/admin/overview/index.html.erb +++ b/app/views/admin/overview/index.html.erb @@ -22,6 +22,17 @@ +

Analytics

+
+
+
+

<%= @open_abuse_reports_count %>

+

+ <%= "Open report".pluralize(@open_abuse_reports_count) %> +

+
+
+

Resources