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

handle deeply nested conditions properly in active record adapter - closes #246

Browse Source
This commit is contained in:
Ryan Bates
2011-01-20 10:12:46 -08:00
parent 5c4c179c5a
commit f9ad4858f5
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,12 +31,13 @@ module CanCan
end
end
def tableized_conditions(conditions)
def tableized_conditions(conditions, model_class = @model_class)
return conditions unless conditions.kind_of? Hash
conditions.inject({}) do |result_hash, (name, value)|
if value.kind_of? Hash
name = @model_class.reflect_on_association(name).table_name
value = tableized_conditions(value)
association_class = model_class.reflect_on_association(name).class_name.constantize
name = model_class.reflect_on_association(name).table_name
value = tableized_conditions(value, association_class)
end
result_hash[name] = value
result_hash