Mercurial > hg > soundsoftware-site
comparison app/controllers/members_controller.rb @ 313:862e47cc1e09 live
Merge from branch "bug_97"
author | Chris Cannam |
---|---|
date | Mon, 28 Mar 2011 18:04:17 +0100 |
parents | 5f4ac0a159fa |
children | 7a2bb9c5fb34 |
comparison
equal
deleted
inserted
replaced
312:8019c250165b | 313:862e47cc1e09 |
---|---|
26 members = [] | 26 members = [] |
27 if params[:member] && request.post? | 27 if params[:member] && request.post? |
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 @new_member = Member.new(attrs.merge(:user_id => user_id)) |
32 members << @new_member | |
33 | |
34 # send notification to member | |
35 Mailer.deliver_added_to_project(@new_member, @project) | |
36 | |
32 end | 37 end |
33 else | 38 else |
34 members << Member.new(attrs) | 39 @new_member = Member.new(attrs) |
40 members << @new_member | |
41 | |
42 # send notification to member | |
43 Mailer.deliver_added_to_project(@new_member, @project) | |
44 | |
35 end | 45 end |
46 | |
36 @project.members << members | 47 @project.members << members |
48 | |
37 end | 49 end |
38 respond_to do |format| | 50 respond_to do |format| |
39 if members.present? && members.all? {|m| m.valid? } | 51 if members.present? && members.all? {|m| m.valid? } |
40 | 52 |
41 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project } | 53 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project } |