##// END OF EJS Templates
Backported r9132 from trunk....
Jean-Philippe Lang -
r9029:add23a54b5e2
parent child
Show More
@@ -28,10 +28,10 class MembersController < ApplicationController
28 attrs = params[:member].dup
28 attrs = params[:member].dup
29 if (user_ids = attrs.delete(:user_ids))
29 if (user_ids = attrs.delete(:user_ids))
30 user_ids.each do |user_id|
30 user_ids.each do |user_id|
31 members << Member.new(attrs.merge(:user_id => user_id))
31 members << Member.new(:role_ids => params[:member][:role_ids], :user_id => user_id)
32 end
32 end
33 else
33 else
34 members << Member.new(attrs)
34 members << Member.new(:role_ids => params[:member][:role_ids], :user_id => params[:member][:user_id])
35 end
35 end
36 @project.members << members
36 @project.members << members
37 end
37 end
@@ -64,7 +64,10 class MembersController < ApplicationController
64 end
64 end
65
65
66 def edit
66 def edit
67 if request.post? and @member.update_attributes(params[:member])
67 if params[:member]
68 @member.role_ids = params[:member][:role_ids]
69 end
70 if request.post? and @member.save
68 respond_to do |format|
71 respond_to do |format|
69 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
72 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
70 format.js {
73 format.js {
General Comments 0
You need to be logged in to leave comments. Login now