about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmelia Smith <ThisIsMissEm@users.noreply.github.com>2018-04-17 14:58:11 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-04-17 14:58:11 +0200
commit204d72fbe49b3749e168ed2cd0ff83706946352a (patch)
tree0b2685b3af2dfd8f11f5d6f1694e8a2255e7b2c6
parentef12a2b74c735d78371be3f52b372c03318c3b16 (diff)
Feature: add count of account notes to reports (#7130)
* Reports: Colocate account details with reports

* Reports: Add count of account moderation notes

Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
-rw-r--r--app/views/admin/accounts/_card.html.haml17
-rw-r--r--app/views/admin/reports/_account_details.html.haml20
-rw-r--r--app/views/admin/reports/show.html.haml4
-rw-r--r--config/locales/en.yml10
4 files changed, 32 insertions, 19 deletions
diff --git a/app/views/admin/accounts/_card.html.haml b/app/views/admin/accounts/_card.html.haml
deleted file mode 100644
index 2f5955011..000000000
--- a/app/views/admin/accounts/_card.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-.table-wrapper
-  %table.table
-    %tbody
-      %tr
-        %td= t('admin.accounts.show.created_reports')
-        %td= link_to pluralize(account.reports.count, t('admin.accounts.show.report')), admin_reports_path(account_id: account.id)
-      %tr
-        %td= t('admin.accounts.show.targeted_reports')
-        %td= link_to pluralize(account.targeted_reports.count, t('admin.accounts.show.report')), admin_reports_path(target_account_id: account.id)
-      - if account.silenced? || account.suspended?
-        %tr
-          %td= t('admin.accounts.moderation.title')
-          %td
-            - if account.silenced?
-              %p= t('admin.accounts.moderation.silenced')
-            - if account.suspended?
-              %p= t('admin.accounts.moderation.suspended')
diff --git a/app/views/admin/reports/_account_details.html.haml b/app/views/admin/reports/_account_details.html.haml
new file mode 100644
index 000000000..a8af39bef
--- /dev/null
+++ b/app/views/admin/reports/_account_details.html.haml
@@ -0,0 +1,20 @@
+.table-wrapper
+  %table.table
+    %tbody
+      %tr
+        %td= t('admin.reports.account.created_reports')
+        %td= link_to pluralize(account.reports.count, t('admin.reports.account.report')), admin_reports_path(account_id: account.id)
+      %tr
+        %td= t('admin.reports.account.targeted_reports')
+        %td= link_to pluralize(account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: account.id)
+      %tr
+        %td= t('admin.reports.account.moderation_notes')
+        %td= link_to pluralize(account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: account.id)
+      - if account.silenced? || account.suspended?
+        %tr
+          %td= t('admin.reports.account.moderation.title')
+          %td
+            - if account.silenced?
+              %p= t('admin.reports.account.moderation.silenced')
+            - if account.suspended?
+              %p= t('admin.reports.account.moderation.suspended')
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index d57b4adc8..130650001 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -60,11 +60,11 @@
   .report-accounts__item
     %h3= t('admin.reports.reported_account')
     = render 'authorize_follows/card', account: @report.target_account, admin: true
-    = render 'admin/accounts/card', account: @report.target_account
+    = render 'admin/reports/account_details', account: @report.target_account
   .report-accounts__item
     %h3= t('admin.reports.reported_by')
     = render 'authorize_follows/card', account: @report.account, admin: true
-    = render 'admin/accounts/card', account: @report.account
+    = render 'admin/reports/account_details', account: @report.account
 
 %h3= t('admin.reports.comment.label')
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4816cc599..20bfd0f8c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -259,6 +259,16 @@ en:
       created_msg: Report note successfully created!
       destroyed_msg: Report note successfully deleted!
     reports:
+      account:
+        created_reports: Reports created by this account
+        moderation:
+          silenced: Silenced
+          suspended: Suspended
+          title: Moderation
+        moderation_notes: Moderation Notes
+        note: note
+        report: report
+        targeted_reports: Reports made about this account
       action_taken_by: Action taken by
       are_you_sure: Are you sure?
       assign_to_self: Assign to me