floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

修复：推送代码冲突

This commit is contained in:
yystopf 2024-08-21 17:36:03 +08:00
parent 0643d24486
commit 63753c3963
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/models/journal.rb
View File

@ -114,15 +114,15 @@ class Journal < ApplicationRecord
content.gsub!('拒绝', '已拒绝')
return content
when 'root_id'
old_value = "<b>#{Issue.find_by_id(detail.old_value)&.subject}</b>"
new_value = "<b>#{Issue.find_by_id(detail.value)&.subject}</b>"
old_value = "<b><#{Issue.find_by_id(detail.old_value)&.subject}></b>"
new_value = "<b><#{Issue.find_by_id(detail.value)&.subject}></b>"
if detail.old_value.nil? || detail.old_value.blank?
content += "关联了父需求<#{new_value}>"
content += "关联了父需求#{new_value}"
else
if detail.value.nil? || detail.value.blank?
content += "取消了关联的父需求<#{old_value}>"
content += "取消了关联的父需求#{old_value}"
else
content += "将关联的父需求由<#{old_value}>更改为<#{new_value}>"
content += "将关联的父需求由#{old_value}更改为#{new_value}"
end
end
return content
@ -174,15 +174,15 @@ class Journal < ApplicationRecord
content.gsub!('拒绝', '已拒绝')
return content
when 'root_id'
old_value = "<b>#{Issue.find_by_id(detail.old_value)&.subject}</b>"
new_value = "<b>#{Issue.find_by_id(detail.value)&.subject}</b>"
old_value = "<b><#{Issue.find_by_id(detail.old_value)&.subject}></b>"
new_value = "<b><#{Issue.find_by_id(detail.value)&.subject}></b>"
if detail.old_value.nil? || detail.old_value.blank?
content += "关联了父任务<#{new_value}>"
content += "关联了父任务#{new_value}"
else
if detail.value.nil? || detail.value.blank?
content += "取消了关联的父任务<#{old_value}>"
content += "取消了关联的父任务#{old_value}"
else
content += "将关联的父任务由<#{old_value}>更改为<#{new_value}>"
content += "将关联的父任务由#{old_value}>更改为#{new_value}"
end
end
return content
@ -234,15 +234,15 @@ class Journal < ApplicationRecord
content.gsub!('拒绝', '已拒绝')
return content
when 'root_id'
old_value = "<b>#{Issue.find_by_id(detail.old_value)&.subject}</b>"
new_value = "<b>#{Issue.find_by_id(detail.value)&.subject}</b>"
old_value = "<b><#{Issue.find_by_id(detail.old_value)&.subject}></b>"
new_value = "<b><#{Issue.find_by_id(detail.value)&.subject}></b>"
if detail.old_value.nil? || detail.old_value.blank?
content += "关联了父缺陷<#{new_value}>"
content += "关联了父缺陷#{new_value}"
else
if detail.value.nil? || detail.value.blank?
content += "取消了关联的父缺陷<#{old_value}>"
content += "取消了关联的父缺陷#{old_value}"
else
content += "将关联的父缺陷由<#{old_value}>更改为<#{new_value}>"
content += "将关联的父缺陷由#{old_value}更改为#{new_value}"
end
end
return content