github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use scoped here to get the scoped where

Browse Source
This commit is contained in:
Santiago Pastorino
2010-09-05 20:26:24 -03:00
parent c91605b15b
commit 0a7b481903
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/associations/association_collection.rb
View File

@@ -493,11 +493,9 @@ module ActiveRecord
attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
ensure_owner_is_not_new
_scope = self.construct_scope[:create]
csm = @reflection.klass.send(:current_scoped_methods)
options = (csm.blank? || !_scope.is_a?(Hash)) ? _scope : _scope.merge(csm.where_values_hash)
record = @reflection.klass.send(:with_scope, :create => options) do
scoped_where = scoped.where_values_hash
create_scope = scoped_where ? construct_scope[:create].merge(scoped_where) : construct_scope[:create]
record = @reflection.klass.send(:with_scope, :create => create_scope) do
@reflection.build_association(attrs)
end
if block_given?