Mercurial > hg > soundsoftware-site

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents af80e5618e9b
children cbb26bc654de
line wrap: on
line diff
--- a/app/models/group.rb	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/models/group.rb	Thu Jul 14 10:50:53 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)