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

Fix not-working team memebership permissions change

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-18 16:40:11 +02:00
parent 1481d1cfe0
commit 97de6f851b
3 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/main.js.coffee
View file

@ -49,6 +49,10 @@ $ ->
# Bottom tooltip # Bottom tooltip
$('.has_bottom_tooltip').tooltip(placement: 'bottom') $('.has_bottom_tooltip').tooltip(placement: 'bottom')
# Form submitter
$('.trigger-submit').on 'change', ->
$(@).parents('form').submit()
# Flash # Flash
if (flash = $("#flash-container")).length > 0 if (flash = $("#flash-container")).length > 0
flash.click -> $(@).slideUp("slow") flash.click -> $(@).slideUp("slow")

9
app/controllers/teams/members_controller.rb
View file

@ -27,7 +27,13 @@ class Teams::MembersController < Teams::ApplicationController
end end
def update def update
options = {default_projects_access: params[:default_project_access], group_admin: params[:group_admin]} member_params = params[:team_member]
options = {
default_projects_access: member_params[:permission],
group_admin: member_params[:group_admin]
}
if user_team.update_membership(team_member, options) if user_team.update_membership(team_member, options)
redirect_to team_members_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users." redirect_to team_members_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
else else
@ -45,5 +51,4 @@ class Teams::MembersController < Teams::ApplicationController
def team_member def team_member
@member ||= user_team.members.find_by_username(params[:id]) @member ||= user_team.members.find_by_username(params[:id])
end end
end end

14
app/views/teams/members/_show.html.haml
View file

@ -10,16 +10,14 @@
%br %br
%small.cgray= user.email %small.cgray= user.email
.span6.pull-right .span4
- if allow_admin - if allow_admin
.left.span2
= 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|
= f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium project-access-select span2" = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium trigger-submit"
.left.span2 %br
%span = label_tag do
- if @team.admin?(user) = f.check_box :group_admin, class: 'trigger-submit'
%i.icon-check %span Admin access
Admin access
.pull-right .pull-right
- if current_user == user - if current_user == user
%span.btn.disabled This is you! %span.btn.disabled This is you!