support has_many association or arrays in can conditions hash

2010-04-22 17:39:22 -07:00
parent e20081454f
commit 06296b0a40
3 changed files with 13 additions and 1 deletions
--- a/lib/cancan/can_definition.rb
+++ b/lib/cancan/can_definition.rb
@@ -65,7 +65,11 @@ module CanCan
      conditions.all? do |name, value|
        attribute = subject.send(name)
        if value.kind_of?(Hash)
-          matches_conditions? attribute, value
+          if attribute.kind_of? Array
+            attribute.any? { |element| matches_conditions? element, value }
+          else
+            matches_conditions? attribute, value
+          end
        elsif value.kind_of?(Array) || value.kind_of?(Range)
          value.include? attribute
        else