floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed 组织成员数取组织内成员和组织所有仓库成员组合,加入时间

This commit is contained in:
xxq250 2024-01-29 17:35:08 +08:00
parent 627332e93a
commit 036acfc43d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ json.team_names user.teams.where("teams.organization_id=?", organization.id).plu
join_date = if user.organization_users.find_by(:organization_id => organization.id).present? join_date = if user.organization_users.find_by(:organization_id => organization.id).present?
user.organization_users.find_by(:organization_id => organization.id).created_at.strftime("%Y-%m-%d") user.organization_users.find_by(:organization_id => organization.id).created_at.strftime("%Y-%m-%d")
elsif user.members.joins(:project).find_by(project: organization.projects).present? elsif user.members.joins(:project).find_by(project: organization.projects).present?
user.members.joins(:project).find_by(project: organization.projects).created_at.strftime("%Y-%m-%d") user.members.joins(:project).find_by(project: organization.projects).created_on.strftime("%Y-%m-%d")
else else
user.created_on.strftime("%Y-%m-%d") user.created_on.strftime("%Y-%m-%d")
end end