Merge branch 'standalone_develop' into dev_osredm_server

This commit is contained in:
yystopf 2025-07-31 16:43:16 +08:00
commit 5fd12e8dd3
1 changed files with 1 additions and 1 deletions

View File

@ -8,7 +8,7 @@ end
if journal.is_journal_detail?
detail = journal.journal_details.take
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? ? @issue.pm_issue_type.nil? ? journal.operate_content : journal.pm_operate_content : nil
json.operate_content journal.is_journal_detail? ? @issue.pm_project_id.nil? && @issue.pm_issue_type.nil? ? journal.operate_content : journal.pm_operate_content : nil
else
json.notes journal.notes
json.comments_count journal.comments_count