floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 20:55:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pre_trustie_server' into trustie_server

Browse Source
This commit is contained in:
xxq250
2024-10-15 08:59:31 +08:00
parent 77f31e3a78 1bf1651b0c
commit 13517c8eab
45 changed files with 384 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,18 +27,10 @@ json.milestone do
end
end
json.author do
if issue.user.present?
json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
else
json.nil!
end
json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
end
json.changer do
if issue.changer.present?
json.partial! "api/v1/users/simple_user", locals: {user: issue.changer}
else
json.nil!
end
json.partial! "api/v1/users/simple_user", locals: {user: issue.changer}
end
json.assigners issue.show_assigners.each do |assigner|
json.partial! "api/v1/users/simple_user", locals: {user: assigner}

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

@@ -33,11 +33,7 @@ json.time_scale issue.time_scale
json.child_count issue.child_count
json.author do
if issue.user.present?
json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
else
json.nil!
end
json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
end
json.assigners issue.show_assigners.each do |assigner|
json.partial! "api/v1/users/simple_user", locals: {user: assigner}

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

@@ -2,17 +2,13 @@ json.id journal.id
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.user do
if journal.user.present?
json.partial! "api/v1/users/simple_user", user: journal.user
else
json.nil!
end
json.user do
json.partial! "api/v1/users/simple_user", user: journal.user
end
if journal.is_journal_detail?
detail = journal.journal_details.take
json.operate_category detail.property == "attr" ? detail.prop_key : detail.property
json.operate_content journal.is_journal_detail? ? journal.operate_content : nil
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
else
json.notes journal.notes
json.comments_count journal.comments_count

7
app/views/api/v1/users/_simple_user.json.jbuilder
View File

@@ -4,6 +4,9 @@ if user.present?
json.name user.real_name
json.login user.login
json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(user).to_s
else
json.nil!
else
json.name "已注销"
json.login user&.login
json.type "User"
json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + "images/account/del.svg"
end