Show group members on project team page
This commit is contained in:
parent
b4fe5a76a7
commit
5bed576ac2
3 changed files with 22 additions and 22 deletions
|
@ -8,6 +8,7 @@ class TeamMembersController < ProjectResourceController
|
|||
@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)
|
||||
|
||||
@group = @project.group
|
||||
@assigned_teams = @project.user_team_project_relationships
|
||||
end
|
||||
|
||||
|
|
|
@ -1,27 +1,17 @@
|
|||
- user = member.user
|
||||
- allow_admin = current_user_can_admin_project
|
||||
%li{id: dom_id(user), class: "team_member_row user_#{user.id}"}
|
||||
.row
|
||||
.span4
|
||||
= link_to user, title: user.name, class: "dark" do
|
||||
= image_tag gravatar_icon(user.email, 32), class: "avatar s32"
|
||||
%strong= truncate(user.name, lenght: 40)
|
||||
%br
|
||||
%small.cgray= user.username
|
||||
.pull-right
|
||||
- if allow_admin
|
||||
.pull-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"
|
||||
|
||||
= 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 @@
|
|||
|
||||
%hr
|
||||
|
||||
|
||||
.clearfix
|
||||
.row
|
||||
.span3
|
||||
|
@ -49,6 +50,14 @@
|
|||
= render "team_members/assigned_teams", assigned_teams: @assigned_teams
|
||||
|
||||
.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
|
||||
= render "team_members/team", team: @team
|
||||
|
||||
|
|
Loading…
Reference in a new issue