discourse
/
discourse-user-notes
mirror of https://github.com/discourse/discourse-user-notes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: uses user type for reports

This commit is contained in:
Joffrey JAFFEUX 2018-08-19 15:44:03 +02:00
parent 82e1e53432
commit 95777eed38
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugin.rb
View File

@ -270,8 +270,24 @@ after_initialize do
report.data = [] report.data = []
report.labels = [ report.labels = [
{ type: :link, properties: ["username", "user_url"], title: I18n.t("reports.staff_notes.labels.user") }, {
{ type: :link, properties: ["moderator_username", "moderator_url"], title: I18n.t("reports.staff_notes.labels.moderator") }, type: :user,
properties: {
username: :username,
id: :user_id,
avatar: :user_avatar_template,
},
title: I18n.t("reports.staff_notes.labels.user")
},
{
type: :user,
properties: {
username: :moderator_username,
id: :moderator_id,
avatar: :moderator_avatar_template,
},
title: I18n.t("reports.staff_notes.labels.moderator")
},
{ type: :text, property: :note, title: I18n.t("reports.staff_notes.labels.note") } { type: :text, property: :note, title: I18n.t("reports.staff_notes.labels.note") }
] ]
@ -292,11 +308,11 @@ after_initialize do
if user && moderator if user && moderator
data[:created_at] = created_at data[:created_at] = created_at
data[:user_id] = user.id data[:user_id] = user.id
data[:user_url] = "/admin/users/#{user.id}/#{user.username_lower}" data[:username] = user.username_lower
data[:username] = user.username data[:user_avatar_template] = User.avatar_template(user.username_lower, user.uploaded_avatar_id)
data[:moderator_id] = moderator.id data[:moderator_id] = moderator.id
data[:moderator_username] = moderator.username data[:moderator_username] = moderator.username_lower
data[:moderator_url] = "/admin/users/#{moderator.id}/#{moderator.username_lower}" data[:moderator_avatar_template] = User.avatar_template(moderator.username_lower, moderator.uploaded_avatar_id)
data[:note] = note['raw'] data[:note] = note['raw']
report.data << data report.data << data
end end