summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-11-27 14:47:31 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-11-27 14:47:31 +0000
commitbdb888476d06d7715e6ceeea4b1908976fad9543 (patch)
treef356982745970d0e0da22b16522b8d3060d17ed1
parentf5f55359a8a4c2020d98eab1f622a1b380cfad53 (diff)
downloadredmine-bdb888476d06d7715e6ceeea4b1908976fad9543.tar.gz
redmine-bdb888476d06d7715e6ceeea4b1908976fad9543.zip
Merged r4437 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4438 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/group.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/group.rb b/app/models/group.rb
index 80e096be8..1b55c2566 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -31,6 +31,7 @@ class Group < Principal
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)