m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version的id为0的问题的修复

Browse Source
dev_forge
sylor_huang@126.com 5 years ago
parent f559edfd5e
commit 8d7b7cc71e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File

20
app/models/journal.rb
Unescape View File

@ -37,9 +37,9 @@ class Journal < ApplicationRecord
when "assigned_to_id" when "assigned_to_id"
u = User.select(:id, :login, :lastname, :firstname) u = User.select(:id, :login, :lastname, :firstname)
old_value = de[2].to_i > 0 ? u.find(de[2]).try(:show_real_name) : "" old_value = de[2].to_i > 0 ? u.find(de[2]).try(:show_real_name) : ""
assign_user = de[3].present? ? u.find(de[3]) : "" assign_user = de[3].to_i > 0 ? u.find(de[3]) : ""
if assign_user.present? if assign_user.present?
value = u.find(de[3]).try(:show_real_name) value = assign_user.try(:show_real_name)
else else
value = "取消了指派" value = "取消了指派"
end end
@ -47,9 +47,9 @@ class Journal < ApplicationRecord
when "tracker_id" when "tracker_id"
t = Tracker.select(:id, :name) t = Tracker.select(:id, :name)
old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : "" old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : ""
tracker_name = de[3].present? ? t.find(de[3]) : "" tracker_name = de[3].to_i > 0 ? t.find(de[3]) : ""
if tracker_name if tracker_name
value = t.find(de[3]).try(:name) value = tracker_name.try(:name)
else else
value = "取消了类型" value = "取消了类型"
end end
@ -57,18 +57,18 @@ class Journal < ApplicationRecord
when "status_id" when "status_id"
t = IssueStatus.select(:id, :name) t = IssueStatus.select(:id, :name)
old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : "" old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : ""
type_name = de[3].present? ? t.find(de[3]) : "" type_name = de[3].to_i > 0 ? t.find(de[3]) : ""
if type_name if type_name
value = t.find(de[3]).try(:name) value = type_name.try(:name)
else else
value = "取消了状态" value = "取消了状态"
end end
when "priority_id" when "priority_id"
t = IssuePriority.select(:id, :name) t = IssuePriority.select(:id, :name)
old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name): "" old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name): ""
type_name = de[3].present? ? t.find(de[3]) : "" type_name = de[3].to_i > 0 ? t.find(de[3]) : ""
if type_name if type_name
value = t.find(de[3]).try(:name) value = type_name.try(:name)
else else
value = "取消了优先级" value = "取消了优先级"
end end
@ -82,10 +82,8 @@ class Journal < ApplicationRecord
end end
when "fixed_version_id" when "fixed_version_id"
t = Version.select(:id, :name) t = Version.select(:id, :name)
Rails.logger.info("##############___________de[2]_______############{de[2]}")
old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : "" old_value = de[2].to_i > 0 ? t.find(de[2]).try(:name) : ""
Rails.logger.info("##############___________old_value_______############{old_value}") type_name = de[3].to_i > 0 ? t.find(de[3]) : ""
type_name = de[3].present? ? t.find(de[3]) : ""
if type_name if type_name
value = type_name.try(:name) value = type_name.try(:name)
else else

Write Preview
Loading…
Cancel
Save