Mercurial > hg > soundsoftware-site

diff app/models/.svn/text-base/group.rb.svn-base @ 511:107d36338b70 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "cannam"
author Chris Cannam
date Thu, 14 Jul 2011 10:43:07 +0100
parents af80e5618e9b
children
line wrap: on
line diff
--- a/app/models/.svn/text-base/group.rb.svn-base	Thu Jun 09 16:51:06 2011 +0100
+++ b/app/models/.svn/text-base/group.rb.svn-base	Thu Jul 14 10:43:07 2011 +0100
@@ -31,6 +31,7 @@
   
   def user_added(user)
     members.each do |member|
+      next if member.project.nil?
       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)
       member.member_roles.each do |member_role|
         user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id)