deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Dont show assigned_teams block unless any. Show count in filter

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-18 21:21:24 +02:00
parent a29db26cc9
commit ba937b2b3d
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/team_members_controller.rb
View file

@ -7,6 +7,8 @@ class TeamMembersController < ProjectResourceController
@team = @project.users_projects.scoped @team = @project.users_projects.scoped
@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)
@assigned_teams = @project.user_team_project_relationships
end end
def show def show

2
app/views/team_members/_assigned_teams.html.haml
View file

@ -1,4 +1,4 @@
.ui-box .ui-box
%ul.well-list %ul.well-list
- @project.user_team_project_relationships.sort_by(&:team_name).each do |team_relation| - assigned_teams.sort_by(&:team_name).each do |team_relation|
= render "team_members/assigned_team", team_relation: team_relation, team: team_relation.user_team = render "team_members/assigned_team", team_relation: team_relation, team: team_relation.user_team

10
app/views/team_members/_team.html.haml
View file

@ -1,4 +1,4 @@
- @team.each do |access, members| - team.each do |access, members|
.ui-box .ui-box
%h5.title %h5.title
= Project.access_options.key(access).pluralize = Project.access_options.key(access).pluralize
@ -6,11 +6,3 @@
%ul.well-list %ul.well-list
- members.sort_by(&:user_name).each do |team_member| - members.sort_by(&:user_name).each do |team_member|
= render 'team_members/team_member', member: team_member = render 'team_members/team_member', member: team_member
:javascript
$(function(){
$('.repo-access-select, .project-access-select').live("change", function() {
$(this.form).submit();
});
})

2
app/views/team_members/_team_member.html.haml
View file

@ -14,7 +14,7 @@
- if allow_admin - if allow_admin
.left .left
= form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f| = 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" = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
.pull-right .pull-right
- if current_user == user - if current_user == user
%span.label This is you! %span.label This is you!

18
app/views/team_members/index.html.haml
View file

@ -27,24 +27,30 @@
%li{class: ("active" if params[:type] == 'masters')} %li{class: ("active" if params[:type] == 'masters')}
= link_to project_team_members_path(type: 'masters') do = link_to project_team_members_path(type: 'masters') do
Masters Masters
%span.pull-right= @project.users_projects.masters.count
%li{class: ("active" if params[:type] == 'developers')} %li{class: ("active" if params[:type] == 'developers')}
= link_to project_team_members_path(type: 'developers') do = link_to project_team_members_path(type: 'developers') do
Developers Developers
%span.pull-right= @project.users_projects.developers.count
%li{class: ("active" if params[:type] == 'reporters')} %li{class: ("active" if params[:type] == 'reporters')}
= link_to project_team_members_path(type: 'reporters') do = link_to project_team_members_path(type: 'reporters') do
Reporters Reporters
%span.pull-right= @project.users_projects.reporters.count
%li{class: ("active" if params[:type] == 'guests')} %li{class: ("active" if params[:type] == 'guests')}
= link_to project_team_members_path(type: 'guests') do = link_to project_team_members_path(type: 'guests') do
Guests Guests
%h5 %span.pull-right= @project.users_projects.guests.count
Assigned teams
(#{@project.user_teams.count}) - if @assigned_teams.present?
%div %h5
= render "team_members/assigned_teams", project: @project Assigned teams
(#{@project.user_teams.count})
%div
= render "team_members/assigned_teams", assigned_teams: @assigned_teams
.span9 .span9
%div.team-table %div.team-table
= render "team_members/team", project: @project = render "team_members/team", team: @team