From 8d7b7cc71e39817bde5d706a063c5d1a724d74ca Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 20 Feb 2020 11:58:57 +0800 Subject: [PATCH] =?UTF-8?q?version=E7=9A=84id=E4=B8=BA0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=9A=84=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/models/journal.rb b/app/models/journal.rb index 145477b7e..d0ec21428 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -37,9 +37,9 @@ class Journal < ApplicationRecord when "assigned_to_id" u = User.select(:id, :login, :lastname, :firstname) 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? - value = u.find(de[3]).try(:show_real_name) + value = assign_user.try(:show_real_name) else value = "取消了指派" end @@ -47,9 +47,9 @@ class Journal < ApplicationRecord when "tracker_id" t = Tracker.select(:id, :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 - value = t.find(de[3]).try(:name) + value = tracker_name.try(:name) else value = "取消了类型" end @@ -57,18 +57,18 @@ class Journal < ApplicationRecord when "status_id" t = IssueStatus.select(:id, :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 - value = t.find(de[3]).try(:name) + value = type_name.try(:name) else value = "取消了状态" end when "priority_id" t = IssuePriority.select(:id, :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 - value = t.find(de[3]).try(:name) + value = type_name.try(:name) else value = "取消了优先级" end @@ -82,10 +82,8 @@ class Journal < ApplicationRecord end when "fixed_version_id" 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) : "" - Rails.logger.info("##############___________old_value_______############{old_value}") - type_name = de[3].present? ? t.find(de[3]) : "" + type_name = de[3].to_i > 0 ? t.find(de[3]) : "" if type_name value = type_name.try(:name) else