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

Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

This commit is contained in:
xxq250 2024-09-27 09:35:46 +08:00
parent 47f8ce478c 7f4bb60b5e
commit a628043efe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/api/v1/issues/journals/_detail.json.jbuilder
View File

@ -11,8 +11,8 @@ json.user do
end end
if journal.is_journal_detail? if journal.is_journal_detail?
detail = journal.journal_details.take detail = journal.journal_details.take
json.operate_category detail.property == "attr" ? detail.prop_key : detail.property json.operate_category @issue.pm_issue_type.nil? ? detail.property == "attr" ? detail.prop_key : detail.property : journal.pm_operate_category
json.operate_content journal.is_journal_detail? ? journal.operate_content : nil json.operate_content journal.is_journal_detail? ? @issue.pm_issue_type.nil? ? journal.operate_content : journal.pm_operate_content : nil
else else
json.notes journal.notes json.notes journal.notes
json.comments_count journal.comments_count json.comments_count journal.comments_count