From 0cb33d2b5259bb0fb9a374a9dcc0c15b9504a52a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 12 Nov 2018 16:23:10 -0500 Subject: [PATCH] UX: Rename Most Disagreed Flaggers report to "User Flagging Ratio" --- .../admin-dashboard-next-moderation.js.es6 | 2 +- .../admin/templates/dashboard_next_moderation.hbs | 4 ++-- app/models/report.rb | 14 +++++++------- config/locales/server.de.yml | 2 +- config/locales/server.en.yml | 4 ++-- config/locales/server.es.yml | 2 +- spec/models/report_spec.rb | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 index a16faa821bf..df06e682f48 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6 @@ -13,7 +13,7 @@ export default Ember.Controller.extend(PeriodComputationMixin, { }, @computed - mostDisagreedFlaggersOptions() { + userFlaggingRatioOptions() { return { table: { total: false, diff --git a/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs index ce2736bb15b..dbfbb02ea59 100644 --- a/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs +++ b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs @@ -34,9 +34,9 @@ filters=lastWeekfilters}} {{admin-report - dataSourceName="most_disagreed_flaggers" + dataSourceName="user_flagging_ratio" filters=lastWeekfilters - reportOptions=mostDisagreedFlaggersOptions}} + reportOptions=userFlaggingRatioOptions}} {{plugin-outlet name="admin-dashboard-moderation-bottom"}} diff --git a/app/models/report.rb b/app/models/report.rb index da941bb594d..8dba01e9d58 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -1170,7 +1170,7 @@ class Report end end - def self.report_most_disagreed_flaggers(report) + def self.report_user_flagging_ratio(report) report.data = [] report.modes = [:table] @@ -1185,27 +1185,27 @@ class Report id: :user_id, avatar: :avatar_template, }, - title: I18n.t("reports.most_disagreed_flaggers.labels.user") + title: I18n.t("reports.user_flagging_ratio.labels.user") }, { type: :number, property: :disagreed_flags, - title: I18n.t("reports.most_disagreed_flaggers.labels.disagreed_flags") + title: I18n.t("reports.user_flagging_ratio.labels.disagreed_flags") }, { type: :number, property: :agreed_flags, - title: I18n.t("reports.most_disagreed_flaggers.labels.agreed_flags") + title: I18n.t("reports.user_flagging_ratio.labels.agreed_flags") }, { type: :number, property: :ignored_flags, - title: I18n.t("reports.most_disagreed_flaggers.labels.ignored_flags") + title: I18n.t("reports.user_flagging_ratio.labels.ignored_flags") }, { type: :number, property: :score, - title: I18n.t("reports.most_disagreed_flaggers.labels.score") + title: I18n.t("reports.user_flagging_ratio.labels.score") }, ] @@ -1224,7 +1224,7 @@ class Report WHERE u.id <> -1 AND flags_disagreed > flags_agreed ORDER BY score DESC - LIMIT 20 + LIMIT 100 SQL DB.query(sql).each do |row| diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 6ab2839a793..e6538384311 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -797,7 +797,7 @@ de: editor: Bearbeiter author: Ersteller edit_reason: Grund - most_disagreed_flaggers: + user_flagging_ratio: title: "Melder mit höchster Ablehnung" labels: user: Benutzer diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d4c34175047..c21e5afacab 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -894,8 +894,8 @@ en: editor: Editor author: Author edit_reason: Reason - most_disagreed_flaggers: - title: "Most disagreed flaggers" + user_flagging_ratio: + title: "User Flagging Ratio" labels: user: User agreed_flags: Agreed flags diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index c62e926c772..696a540d0eb 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -796,7 +796,7 @@ es: editor: Editor author: Autor edit_reason: Motivo - most_disagreed_flaggers: + user_flagging_ratio: title: "Most disagreed flaggers" labels: user: Usuari diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index 6a14a38d4d2..b0a43dc712e 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_spec.rb @@ -936,7 +936,7 @@ describe Report do end end - describe 'most_disagreed_flaggers' do + describe 'user_flagging_ratio' do let(:joffrey) { Fabricate(:user, username: "joffrey") } let(:robin) { Fabricate(:user, username: "robin") } let(:moderator) { Fabricate(:moderator) } @@ -958,7 +958,7 @@ describe Report do PostAction.act(robin, post_agreed, PostActionType.types[:off_topic]) PostAction.agree_flags!(post_agreed, moderator) - report = Report.find('most_disagreed_flaggers') + report = Report.find('user_flagging_ratio') first = report.data[0] expect(first[:username]).to eq("joffrey")