[FIX]teams add user info
This commit is contained in:
parent
152e301bf3
commit
1e70764d63
|
@ -9,6 +9,8 @@ class Organizations::TeamsController < Organizations::BaseController
|
|||
else
|
||||
@teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
|
||||
end
|
||||
@is_admin = can_edit_org?
|
||||
@teams = @teams.includes(:team_units, :team_users)
|
||||
|
||||
@teams = kaminari_paginate(@teams)
|
||||
end
|
||||
|
|
|
@ -7,3 +7,8 @@ json.can_create_org_project team.can_create_org_project
|
|||
json.num_projects team.num_projects
|
||||
json.num_users team.num_users
|
||||
json.units team.team_units.pluck(:unit_type)
|
||||
json.users team.team_users.each do |user|
|
||||
json.partial! "organizations/user_detail", user: user&.user
|
||||
end
|
||||
json.is_admin @is_admin
|
||||
json.is_member team.is_member?(current_user.id)
|
||||
|
|
Loading…
Reference in New Issue