Ability to limit member management to certain roles (#19707).

git-svn-id: http://svn.redmine.org/redmine/trunk@14293 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-05-31 07:16:23 +00:00
parent 48d40a8c88
commit ed9f00178c
13 changed files with 260 additions and 28 deletions

View File

@@ -53,14 +53,12 @@ class MembersController < ApplicationController
def create
members = []
if params[:membership]
if params[:membership][:user_ids]
attrs = params[:membership].dup
user_ids = attrs.delete(:user_ids)
user_ids.each do |user_id|
members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
end
else
members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
user_ids = Array.wrap(params[:membership][:user_id] || params[:membership][:user_ids])
user_ids << nil if user_ids.empty?
user_ids.each do |user_id|
member = Member.new(:project => @project, :user_id => user_id)
member.set_editable_role_ids(params[:membership][:role_ids])
members << member
end
@project.members << members
end
@@ -84,7 +82,7 @@ class MembersController < ApplicationController
def update
if params[:membership]
@member.role_ids = params[:membership][:role_ids]
@member.set_editable_role_ids(params[:membership][:role_ids])
end
saved = @member.save
respond_to do |format|
@@ -101,7 +99,7 @@ class MembersController < ApplicationController
end
def destroy
if request.delete? && @member.deletable?
if @member.deletable?
@member.destroy
end
respond_to do |format|