diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-05-10 22:47:54 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-10 22:54:40 +0100 |
commit | 9a7dbe2c0570e11b9033df735c937d5f5416e0ca (patch) | |
tree | 3adf27844a83699f7f3c062fc6bc59762f7fb14e /activerecord/lib/active_record | |
parent | 8f999a3f80284e08804c374cb5690c8bc158e4c1 (diff) | |
download | rails-9a7dbe2c0570e11b9033df735c937d5f5416e0ca.tar.gz rails-9a7dbe2c0570e11b9033df735c937d5f5416e0ca.tar.bz2 rails-9a7dbe2c0570e11b9033df735c937d5f5416e0ca.zip |
Don't use mass-assignment protection when applying the scoped.scope_for_create. Fixes #481.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 6 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 85a4f47b7d..59e6e00ad1 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -99,7 +99,6 @@ module ActiveRecord else add_to_target(build_record(attributes, options)) do |record| yield(record) if block_given? - set_owner_attributes(record) end end end @@ -423,7 +422,10 @@ module ActiveRecord end def build_record(attributes, options) - reflection.build_association(scoped.scope_for_create.merge(attributes || {}), options) + record = reflection.build_association + record.assign_attributes(scoped.scope_for_create, :without_protection => true) + record.assign_attributes(attributes || {}, options) + record end def delete_or_destroy(records, method) diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index e6ab628719..e436fef46d 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -14,7 +14,9 @@ module ActiveRecord def target_scope scope = super chain[1..-1].each do |reflection| - scope = scope.merge(reflection.klass.scoped) + # Discard the create with value, as we don't want that the affect the objects we + # create on the association + scope = scope.merge(reflection.klass.scoped.create_with(nil)) end scope end |