Eeeros
/
forgeplus
forked from Gitlink/forgeplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：操作日志用户显示为real_name

This commit is contained in:
yystopf 2023-03-14 14:02:39 +08:00
parent 4318293c1f
commit fca06c9816
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/journal.rb
View File

@ -82,8 +82,8 @@ class Journal < ApplicationRecord
content += "将标记由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
end
when 'assigner'
old_value = User.where(id: detail.old_value.split(",")).pluck(:nickname).join("、")
new_value = User.where(id: detail.value.split(",")).pluck(:nickname).join("、")
old_value = User.where(id: detail.old_value.split(",")).map{|u| u.real_name}.join("、")
new_value = User.where(id: detail.value.split(",")).map{|u| u.real_name}.join("、")
if old_value.nil? || old_value.blank?
content += "添加负责人<b>#{new_value}</b>"
else
@ -122,8 +122,8 @@ class Journal < ApplicationRecord
new_value = detail.value
content += "结束日期"
when 'assigned_to_id'
old_value = User.find_by_id(detail.old_value)&.nickname
new_value = User.find_by_id(detail.value)&.nickname
old_value = User.find_by_id(detail.old_value)&.real_name
new_value = User.find_by_id(detail.value)&.real_name
content += "负责人"
end
if old_value.nil? || old_value.blank?