Fix for issue-644 to allow users to specify a mix of can and cannot rules with mongo.

2012-06-10 22:54:45 +01:00
parent 80a8c39a93
commit da663aaed1
2 changed files with 15 additions and 3 deletions
--- a/lib/cancan/model_adapters/mongoid_adapter.rb
+++ b/lib/cancan/model_adapters/mongoid_adapter.rb
@@ -30,8 +30,9 @@ module CanCan
        else
          # we only need to process can rules if
          # there are no rules with empty conditions
-          rules = @rules.reject { |rule| rule.conditions.empty? }
+          rules = @rules.reject { |rule| rule.conditions.empty? && rule.base_behavior }
          process_can_rules = @rules.count == rules.count
+
          rules.inject(@model_class.all) do |records, rule|
            if process_can_rules && rule.base_behavior
              records.or rule.conditions