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

Merge branch 'develop' into dev_trustie_server

Browse Source
This commit is contained in:
jasder
2021-06-11 18:03:35 +08:00
parent 632a06e575 7c43f2d8fc
commit bf390c8366
41 changed files with 1699 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/users/applied_messages/_detail.json.jbuilder
View File

@@ -13,7 +13,12 @@
# json.partial! "/users/user_simple", locals: {user: object.user}
# end
json.applied do
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: object.applied}
case object.applied_type
when 'AppliedTransferProject'
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: object.applied}
when 'AppliedProject'
json.partial! "/applied_projects/detail", locals: {object: object.applied}
end
end
json.applied_user do
json.partial! "/users/user_simple", locals: {user: object.applied_user}

1
app/views/users/applied_projects/accept.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "/applied_projects/detail", locals: {object: @applied_project}

4
app/views/users/applied_projects/index.json.jbuilder Normal file
View File

@@ -0,0 +1,4 @@
json.total_count @applied_projects.total_count
json.applied_projects @applied_projects do |apply|
json.partial! "/applied_projects/detail", locals: {object: apply}
end

1
app/views/users/applied_projects/refuse.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "/applied_projects/detail", locals: {object: @applied_project}

1
app/views/users/show.json.jbuilder
View File

@@ -1,6 +1,7 @@
json.partial! 'users/user', locals: { user: @user }
json.undo_messages @waiting_applied_messages.size
json.undo_transfer_projects @common_applied_transfer_projects.size
json.undo_join_projects @common_applied_projects.size
json.undo_events @undo_events
json.user_composes_count @user_composes_count
json.user_org_count @user_org_count