Browse Source

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

pull/347/head
xxq250 2 years ago
parent
commit
036acfc43d
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      app/views/organizations/organization_users/_detail.json.jbuilder

+ 1
- 1
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?
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?
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
user.created_on.strftime("%Y-%m-%d")
end


Loading…
Cancel
Save