IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: refactoring/refining tables of new dashboard

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-05-22 16:47:23 +02:00
committed by GitHub
parent 7285e7fbba
commit 508b65b76a
9 changed files with 184 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/report.rb
View File

@@ -341,8 +341,11 @@ class Report
def self.report_users_by_trust_level(report)
report.data = []
User.real.group('trust_level').count.sort.each do |level, count|
report.data << { key: TrustLevel.levels[level.to_i], x: level.to_i, y: count }
key = TrustLevel.levels[level.to_i]
url = Proc.new { |key| "/admin/users/list/#{key}" }
report.data << { url: url.call(key), key: key, x: level.to_i, y: count }
end
end
@@ -416,19 +419,20 @@ class Report
def self.report_users_by_type(report)
report.data = []
label = Proc.new { |key| I18n.t("reports.users_by_type.xaxis_labels.#{key}") }
label = Proc.new { |x| I18n.t("reports.users_by_type.xaxis_labels.#{x}") }
url = Proc.new { |key| "/admin/users/list/#{key}" }
admins = User.real.admins.count
report.data << { key: "admins", x: label.call("admin"), y: admins } if admins > 0
report.data << { url: url.call("admins"), icon: "shield", key: "admins", x: label.call("admin"), y: admins } if admins > 0
moderators = User.real.moderators.count
report.data << { key: "moderators", x: label.call("moderator"), y: moderators } if moderators > 0
report.data << { url: url.call("moderators"), icon: "shield", key: "moderators", x: label.call("moderator"), y: moderators } if moderators > 0
suspended = User.real.suspended.count
report.data << { key: "suspended", x: label.call("suspended"), y: suspended } if suspended > 0
report.data << { url: url.call("suspended"), icon: "ban", key: "suspended", x: label.call("suspended"), y: suspended } if suspended > 0
silenced = User.real.silenced.count
report.data << { key: "silenced", x: label.call("silenced"), y: silenced } if silenced > 0
report.data << { url: url.call("silenced"), icon: "ban", key: "silenced", x: label.call("silenced"), y: silenced } if silenced > 0
end
def self.report_top_referred_topics(report)