From ed74c2a8a229c15776572f9e73b05fbd782d4362 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 28 Apr 2008 16:02:06 +0000 Subject: [PATCH] Fixes inherited_from attribute assignation (protected attribute). git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1375 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- groups/app/models/member.rb | 4 +++- groups/app/models/user.rb | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/groups/app/models/member.rb b/groups/app/models/member.rb index b16f6a8ea..6d94aca9b 100644 --- a/groups/app/models/member.rb +++ b/groups/app/models/member.rb @@ -50,7 +50,9 @@ class Member < ActiveRecord::Base if principal.is_a? Group Member.delete_all "inherited_from = #{id}" principal.users.each do |user| - Member.create! :project => project, :role => role, :principal => user, :inherited_from => id + inherited = Member.new :project => project, :role => role, :principal => user + inherited.inherited_from = id + inherited.save! end end end diff --git a/groups/app/models/user.rb b/groups/app/models/user.rb index ecc4b569c..3743fcb3f 100644 --- a/groups/app/models/user.rb +++ b/groups/app/models/user.rb @@ -85,7 +85,10 @@ class User < ActiveRecord::Base Member.delete_all "principal_type = 'User' AND principal_id = #{id} AND inherited_from IS NOT NULL" unless group.nil? group.memberships.each do |m| - Member.create! :project => m.project, :role => m.role, :principal => self, :inherited_from => m.id + inherited = Member.new :project => m.project, :role => m.role, :principal => self + # protected attribute + inherited.inherited_from = m.id + inherited.save! end end end