comparison app/models/group.rb @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents af80e5618e9b
children cbb26bc654de
comparison
equal deleted inserted replaced
512:b9aebdd7dd40 514:7eba09d624db
29 lastname.to_s 29 lastname.to_s
30 end 30 end
31 31
32 def user_added(user) 32 def user_added(user)
33 members.each do |member| 33 members.each do |member|
34 next if member.project.nil?
34 user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id) 35 user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id)
35 member.member_roles.each do |member_role| 36 member.member_roles.each do |member_role|
36 user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id) 37 user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id)
37 end 38 end
38 user_member.save! 39 user_member.save!