will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for issue 560 where joins could be thrown away by ActiveRecordAdapter::merge_joins

Browse Source
This commit is contained in:
David Mike Simon 2012-06-18 19:40:48 -07:00
parent 7bf683d8f4
commit cfc355c006
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cancan/model_adapters/active_record_adapter.rb
View File

@ -145,8 +145,8 @@ module CanCan
# Takes two hashes and does a deep merge. # Takes two hashes and does a deep merge.
def merge_joins(base, add) def merge_joins(base, add)
add.each do |name, nested| add.each do |name, nested|
if base[name].is_a?(Hash) && !nested.empty? if base[name].is_a?(Hash)
merge_joins(base[name], nested) merge_joins(base[name], nested) unless nested.empty?
else else
base[name] = nested base[name] = nested
end end