Download as
Browse Code »

Commit ba937b2b3d81a7a9d3097387150fe8c8f2d784ca

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

Dont show assigned_teams block unless any. Show count in filter

Showing 5 changed files with 17 additions and 17 deletions   Show diff stats
app/controllers/team_members_controller.rb
  Diff comments   View file @ba937b2
@@ -7,6 +7,8 @@ class TeamMembersController < ProjectResourceController @@ -7,6 +7,8 @@ class TeamMembersController < ProjectResourceController
7 @team = @project.users_projects.scoped 7 @team = @project.users_projects.scoped
8 @team = @team.send(params[:type]) if %w(masters developers reporters guests).include?(params[:type]) 8 @team = @team.send(params[:type]) if %w(masters developers reporters guests).include?(params[:type])
9 @team = @team.sort_by(&:project_access).reverse.group_by(&:project_access) 9 @team = @team.sort_by(&:project_access).reverse.group_by(&:project_access)
  10 +
  11 + @assigned_teams = @project.user_team_project_relationships
10 end 12 end
11 13
12 def show 14 def show
app/views/team_members/_assigned_teams.html.haml
  Diff comments   View file @ba937b2
1 .ui-box 1 .ui-box
2 %ul.well-list 2 %ul.well-list
3 - - @project.user_team_project_relationships.sort_by(&:team_name).each do |team_relation| 3 + - assigned_teams.sort_by(&:team_name).each do |team_relation|
4 = render "team_members/assigned_team", team_relation: team_relation, team: team_relation.user_team 4 = render "team_members/assigned_team", team_relation: team_relation, team: team_relation.user_team
app/views/team_members/_team.html.haml
  Diff comments   View file @ba937b2
1 -- @team.each do |access, members| 1 +- team.each do |access, members|
2 .ui-box 2 .ui-box
3 %h5.title 3 %h5.title
4 = Project.access_options.key(access).pluralize 4 = Project.access_options.key(access).pluralize
@@ -6,11 +6,3 @@ @@ -6,11 +6,3 @@
6 %ul.well-list 6 %ul.well-list
7 - members.sort_by(&:user_name).each do |team_member| 7 - members.sort_by(&:user_name).each do |team_member|
8 = render 'team_members/team_member', member: team_member 8 = render 'team_members/team_member', member: team_member
9 -  
10 -  
11 -:javascript  
12 - $(function(){  
13 - $('.repo-access-select, .project-access-select').live("change", function() {  
14 - $(this.form).submit();  
15 - });  
16 - })  
app/views/team_members/_team_member.html.haml
  Diff comments   View file @ba937b2
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 - if allow_admin 14 - if allow_admin
15 .left 15 .left
16 = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f| 16 = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
17 - = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2" 17 + = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
18 .pull-right 18 .pull-right
19 - if current_user == user 19 - if current_user == user
20 %span.label This is you! 20 %span.label This is you!
app/views/team_members/index.html.haml
  Diff comments   View file @ba937b2
@@ -27,24 +27,30 @@ @@ -27,24 +27,30 @@
27 %li{class: ("active" if params[:type] == 'masters')} 27 %li{class: ("active" if params[:type] == 'masters')}
28 = link_to project_team_members_path(type: 'masters') do 28 = link_to project_team_members_path(type: 'masters') do
29 Masters 29 Masters
  30 + %span.pull-right= @project.users_projects.masters.count
30 %li{class: ("active" if params[:type] == 'developers')} 31 %li{class: ("active" if params[:type] == 'developers')}
31 = link_to project_team_members_path(type: 'developers') do 32 = link_to project_team_members_path(type: 'developers') do
32 Developers 33 Developers
  34 + %span.pull-right= @project.users_projects.developers.count
33 %li{class: ("active" if params[:type] == 'reporters')} 35 %li{class: ("active" if params[:type] == 'reporters')}
34 = link_to project_team_members_path(type: 'reporters') do 36 = link_to project_team_members_path(type: 'reporters') do
35 Reporters 37 Reporters
  38 + %span.pull-right= @project.users_projects.reporters.count
36 %li{class: ("active" if params[:type] == 'guests')} 39 %li{class: ("active" if params[:type] == 'guests')}
37 = link_to project_team_members_path(type: 'guests') do 40 = link_to project_team_members_path(type: 'guests') do
38 Guests 41 Guests
39 - %h5  
40 - Assigned teams  
41 - (#{@project.user_teams.count})  
42 - %div  
43 - = render "team_members/assigned_teams", project: @project 42 + %span.pull-right= @project.users_projects.guests.count
  43 +
  44 + - if @assigned_teams.present?
  45 + %h5
  46 + Assigned teams
  47 + (#{@project.user_teams.count})
  48 + %div
  49 + = render "team_members/assigned_teams", assigned_teams: @assigned_teams
44 50
45 .span9 51 .span9
46 %div.team-table 52 %div.team-table
47 - = render "team_members/team", project: @project 53 + = render "team_members/team", team: @team
48 54
49 55
50 56