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

fixed 组织成员数取组织内成员和组织所有仓库成员组合

Browse Source
This commit is contained in:
xxq250
2024-01-29 16:05:04 +08:00
parent 0e8a3ddb79
commit d2663eb7b7
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/organizations/organization_users/_detail.json.jbuilder
View File

@@ -1,7 +1,7 @@
json.id org_user.id
json.id user&.id
json.user do
json.partial! "organizations/user_detail", user: org_user.user
json.partial! "organizations/user_detail", user: user
end
json.team_names org_user.teams.pluck(:nickname)
json.created_at org_user.created_at.strftime("%Y-%m-%d")
json.team_names user.teams.where("teams.organization_id=?", organization.id).pluck(:nickname)
json.created_at user.created_on.strftime("%Y-%m-%d")

8
app/views/organizations/organization_users/index.json.jbuilder
View File

@@ -1,5 +1,5 @@
json.total_count @organization_users.total_count
json.organization_users @organization_users do |org_user|
next if org_user.user.blank?
json.partial! "detail", org_user: org_user, organization: @organization
json.total_count @users.total_count
json.organization_users @users do |user|
next if user.blank?
json.partial! "detail", user: user, organization: @organization
end