diff --git a/app/views/organizations/organization_users/_detail.json.jbuilder b/app/views/organizations/organization_users/_detail.json.jbuilder index b456b35cd..78040e90e 100644 --- a/app/views/organizations/organization_users/_detail.json.jbuilder +++ b/app/views/organizations/organization_users/_detail.json.jbuilder @@ -4,4 +4,11 @@ json.user do end json.team_names user.teams.where("teams.organization_id=?", organization.id).pluck(:nickname) -json.created_at user.created_on.strftime("%Y-%m-%d") +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") + else + user.created_on.strftime("%Y-%m-%d") + end +json.created_at join_date