floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-02 19:30:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xxq250
2025-01-16 15:22:14 +08:00
parent 4be2d817c9 2a77ac99d9
commit 504d01e038
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/api/pm/dashboards/my_operate_journals.json.jbuilder
View File

@@ -8,6 +8,8 @@ json.data do
json.is_journal_detail journal.is_journal_detail?
json.created_at journal.created_on.strftime("%Y-%m-%d %H:%M")
json.updated_at journal.updated_on.strftime("%Y-%m-%d %H:%M")
json.created_time journal.created_on.to_i
json.updated_time journal.updated_on.to_i
json.user do
if journal.user.present?
json.partial! "api/v1/users/simple_user", user: journal.user

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

@@ -38,4 +38,6 @@ end
json.assigners issue.show_assigners.each do |assigner|
json.partial! "api/v1/users/simple_user", locals: {user: assigner}
end
json.comment_journals_count issue.comment_journals.size
json.comment_journals_count issue.comment_journals.size
json.start_date issue.start_date
json.due_date issue.due_date