Download as
Browse Code »

Commit 5bed576ac2c6ea9aa4eac634c605473a12e96b3a

Authored by Dmitriy Zaporozhets
1 parent b4fe5a76
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Show group members on project team page

Showing 3 changed files with 22 additions and 22 deletions   Show diff stats
app/controllers/team_members_controller.rb
  Diff comments   View file @5bed576
... ... @@ -8,6 +8,7 @@ class TeamMembersController < ProjectResourceController
8 8 @team = @team.send(params[:type]) if %w(masters developers reporters guests).include?(params[:type])
9 9 @team = @team.sort_by(&:project_access).reverse.group_by(&:project_access)
10 10  
  11 + @group = @project.group
11 12 @assigned_teams = @project.user_team_project_relationships
12 13 end
13 14  
... ...
app/views/team_members/_team_member.html.haml
  Diff comments   View file @5bed576
1 1 - user = member.user
2 2 - allow_admin = current_user_can_admin_project
3 3 %li{id: dom_id(user), class: "team_member_row user_#{user.id}"}
4   - .row
5   - .span4
6   - = link_to user, title: user.name, class: "dark" do
7   - = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
8   - %strong= truncate(user.name, lenght: 40)
9   - %br
10   - %small.cgray= user.username
  4 + .pull-right
  5 + - if allow_admin
  6 + .pull-left
  7 + = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
  8 + = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
  9 +  
  10 + = 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
  11 + %i.icon-minus.icon-white
  12 + = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
  13 + %p
  14 + %strong= user.name
  15 + %span.cgray= user.username
11 16  
12   - .span4.pull-right
13   - - if allow_admin
14   - .left
15   - = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
16   - = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
17   - .pull-right
18   - - if current_user == user
19   - %span.label.label-success This is you!
20   - - if @project.namespace_owner == user
21   - %span.label.label-info Owner
22   - - elsif user.blocked?
23   - %span.label.label-error Blocked
24   - - elsif allow_admin
25   - = 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
26   - %i.icon-minus.icon-white
27 17  
... ...
app/views/team_members/index.html.haml
  Diff comments   View file @5bed576
... ... @@ -17,6 +17,7 @@
17 17  
18 18 %hr
19 19  
  20 +
20 21 .clearfix
21 22 .row
22 23 .span3
... ... @@ -49,6 +50,14 @@
49 50 = render "team_members/assigned_teams", assigned_teams: @assigned_teams
50 51  
51 52 .span9
  53 + - if @group
  54 + .ui-box
  55 + %h5.title
  56 + = link_to people_group_path(@group) do
  57 + Members of #{@group.name} group
  58 + %ul.well-list
  59 + - @group.users_groups.each do |member|
  60 + = render 'users_groups/users_group', member: member, show_controls: false
52 61 %div.team-table
53 62 = render "team_members/team", team: @team
54 63  
... ...