From 5bed576ac2c6ea9aa4eac634c605473a12e96b3a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 17 Jun 2013 17:55:43 +0300 Subject: [PATCH] Show group members on project team page --- app/controllers/team_members_controller.rb | 1 + app/views/team_members/_team_member.html.haml | 34 ++++++++++----------------- app/views/team_members/index.html.haml | 9 +++++++ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb index 35aa315da..588c2b63c 100644 --- a/app/controllers/team_members_controller.rb +++ b/app/controllers/team_members_controller.rb @@ -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 diff --git a/app/views/team_members/_team_member.html.haml b/app/views/team_members/_team_member.html.haml index d829a7921..4bd4fca67 100644 --- a/app/views/team_members/_team_member.html.haml +++ b/app/views/team_members/_team_member.html.haml @@ -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 diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml index c0f7ee433..ec47c28bd 100644 --- a/app/views/team_members/index.html.haml +++ b/app/views/team_members/index.html.haml @@ -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 -- 2.11.0