Commit 5bed576a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Show group members on project team page

parent b4fe5a76
...@@ -8,6 +8,7 @@ class TeamMembersController < ProjectResourceController ...@@ -8,6 +8,7 @@ class TeamMembersController < ProjectResourceController
@team = @team.send(params[:type]) if %w(masters developers reporters guests).include?(params[:type]) @team = @team.send(params[:type]) if %w(masters developers reporters guests).include?(params[:type])
@team = @team.sort_by(&:project_access).reverse.group_by(&:project_access) @team = @team.sort_by(&:project_access).reverse.group_by(&:project_access)
@group = @project.group
@assigned_teams = @project.user_team_project_relationships @assigned_teams = @project.user_team_project_relationships
end end
......
- user = member.user - user = member.user
- allow_admin = current_user_can_admin_project - allow_admin = current_user_can_admin_project
%li{id: dom_id(user), class: "team_member_row user_#{user.id}"} %li{id: dom_id(user), class: "team_member_row user_#{user.id}"}
.row .pull-right
.span4 - if allow_admin
= link_to user, title: user.name, class: "dark" do .pull-left
= image_tag gravatar_icon(user.email, 32), class: "avatar s32" = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
%strong= truncate(user.name, lenght: 40) = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
%br &nbsp;
%small.cgray= user.username = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
%i.icon-minus.icon-white
= image_tag gravatar_icon(user.email, 32), class: "avatar s32"
%p
%strong= user.name
%span.cgray= user.username
.span4.pull-right
- if allow_admin
.left
= form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
= f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
.pull-right
- if current_user == user
%span.label.label-success This is you!
- if @project.namespace_owner == user
%span.label.label-info Owner
- elsif user.blocked?
%span.label.label-error Blocked
- elsif allow_admin
= link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
%i.icon-minus.icon-white
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
%hr %hr
.clearfix .clearfix
.row .row
.span3 .span3
...@@ -49,6 +50,14 @@ ...@@ -49,6 +50,14 @@
= render "team_members/assigned_teams", assigned_teams: @assigned_teams = render "team_members/assigned_teams", assigned_teams: @assigned_teams
.span9 .span9
- if @group
.ui-box
%h5.title
= link_to people_group_path(@group) do
Members of #{@group.name} group
%ul.well-list
- @group.users_groups.each do |member|
= render 'users_groups/users_group', member: member, show_controls: false
%div.team-table %div.team-table
= render "team_members/team", team: @team = render "team_members/team", team: @team
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment