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

Merge pull request #806 from yuszuv/support_for_nested_joins

Browse Source 
added support for nested join conditions
This commit is contained in:
Ryan Bates
2013-02-21 17:45:54 -08:00
parent 1cb33bdac5 e3ba6688b5
commit cbd352c799
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,11 +66,22 @@ module CanCan
return conditions unless conditions.kind_of? Hash
conditions.inject({}) do |result_hash, (name, value)|
if value.kind_of? Hash
value = value.dup
association_class = model_class.reflect_on_association(name).class_name.constantize
name = model_class.reflect_on_association(name).table_name.to_sym
value = tableized_conditions(value, association_class)
nested = value.inject({}) do |nested,(k,v)|
if v.kind_of? Hash
value.delete(k)
nested[k] = v
else
name = model_class.reflect_on_association(name).table_name.to_sym
result_hash[name] = value
end
nested
end
result_hash.merge!(tableized_conditions(nested,association_class))
else
result_hash[name] = value
end
result_hash[name] = value
result_hash
end
end