From 5bd116ccf4e341b25dbba418b6c5f0ed3b0c5187 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Tue, 13 Mar 2007 09:45:09 +0000 Subject: Make sure with_scope takes both :select and :joins into account when setting :readonly. Allows you to save records you retrieve using finders on a has_many :through associations. [Koz] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6413 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/base.rb') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index f3d4cf856a..03c0054bd0 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -938,7 +938,7 @@ module ActiveRecord #:nodoc: if f = method_scoping[:find] f.assert_valid_keys([ :conditions, :joins, :select, :include, :from, :offset, :limit, :order, :readonly, :lock ]) - f[:readonly] = true if !f[:joins].blank? && !f.has_key?(:readonly) + set_readonly_option! f end # Merge scopings -- cgit v1.2.3