Commit e14718fb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add permission filter to teams -> members page

parent 56b42f58
...@@ -113,5 +113,4 @@ class UserTeam < ActiveRecord::Base ...@@ -113,5 +113,4 @@ class UserTeam < ActiveRecord::Base
def admin?(member) def admin?(member)
user_team_user_relationships.with_user(member).first.group_admin? user_team_user_relationships.with_user(member).first.group_admin?
end end
end end
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- allow_admin = can? current_user, :manage_user_team, @team - allow_admin = can? current_user, :manage_user_team, @team
%li{id: dom_id(member), class: "team_member_row user_#{user.id}"} %li{id: dom_id(member), class: "team_member_row user_#{user.id}"}
.row .row
.span4 .span3
= link_to user_path(user.username), title: user.name, class: "dark" do = link_to user_path(user.username), title: user.name, class: "dark" do
= image_tag gravatar_icon(user.email, 40), class: "avatar s32" = image_tag gravatar_icon(user.email, 40), class: "avatar s32"
= link_to user_path(user.username), title: user.name, class: "dark" do = link_to user_path(user.username), title: user.name, class: "dark" do
...@@ -10,22 +10,22 @@ ...@@ -10,22 +10,22 @@
%br %br
%small.cgray= user.username %small.cgray= user.username
.span7.pull-right .span5.pull-right
- if allow_admin - if allow_admin
.pull-left .pull-left
= form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f| = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
= label_tag do = label_tag :group_admin do
= f.check_box :group_admin, class: 'trigger-submit' = f.check_box :group_admin, class: 'trigger-submit'
%span Admin access %span Admin access
&nbsp; &nbsp;
= f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium trigger-submit" = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "span2 trigger-submit"
.pull-right .pull-right
- if current_user == user - if current_user == user
%span.btn.disabled This is you! %span.label.label-success This is you!
- if @team.owner == user - if @team.owner == user
%span.btn.disabled Owner %span.label.label-info Owner
- elsif user.blocked? - elsif user.blocked?
%span.btn.disabled.blocked Blocked %span.label.label-error Blocked
- elsif allow_admin - elsif allow_admin
= link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do
%i.icon-minus.icon-white %i.icon-minus.icon-white
- grouped_user_team_members(@team).each do |access, members| - grouped_user_team_members(team).each do |access, members|
- access_key = Project.access_options.key(access)
- next if params[:type].present? && params[:type] != access_key.tableize
.ui-box .ui-box
%h5.title %h5.title
= Project.access_options.key(access).pluralize = access_key.pluralize
%small= members.size %small= members.size
%ul.well-list %ul.well-list.team-members
- members.sort_by(&:user_name).each do |up| - members.sort_by(&:user_name).each do |member|
= render(partial: 'teams/members/show', locals: {member: up}) = render 'teams/members/member', member: member
:javascript
$(function(){
$('.repo-access-select, .project-access-select').live("change", function() {
$(this.form).submit();
});
})
...@@ -12,6 +12,26 @@ ...@@ -12,6 +12,26 @@
%hr %hr
.clearfix .row
%div.team-table .span3
= render partial: "teams/members/team", locals: {project: @team} %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if !params[:type])}
= link_to team_members_path(@team, type: nil) do
All
%li{class: ("active" if params[:type] == 'masters')}
= link_to team_members_path(@team, type: 'masters') do
Masters
%li{class: ("active" if params[:type] == 'developers')}
= link_to team_members_path(@team, type: 'developers') do
Developers
%li{class: ("active" if params[:type] == 'reporters')}
= link_to team_members_path(@team, type: 'reporters') do
Reporters
%li{class: ("active" if params[:type] == 'guests')}
= link_to team_members_path(@team, type: 'guests') do
Guests
.span9
.clearfix
%div.team-table
= render "teams/members/team", team: @team
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment