Mercurial > hg > soundsoftware-site
diff 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 |
line wrap: on
line diff
--- a/app/controllers/members_controller.rb Mon Mar 28 17:50:50 2011 +0100 +++ b/app/controllers/members_controller.rb Mon Mar 28 18:04:17 2011 +0100 @@ -28,12 +28,24 @@ attrs = params[:member].dup if (user_ids = attrs.delete(:user_ids)) user_ids.each do |user_id| - members << Member.new(attrs.merge(:user_id => user_id)) + @new_member = Member.new(attrs.merge(:user_id => user_id)) + members << @new_member + + # send notification to member + Mailer.deliver_added_to_project(@new_member, @project) + end else - members << Member.new(attrs) + @new_member = Member.new(attrs) + members << @new_member + + # send notification to member + Mailer.deliver_added_to_project(@new_member, @project) + end + @project.members << members + end respond_to do |format| if members.present? && members.all? {|m| m.valid? }