Fixes bug in mongoid_adapter with empty conditions hash

* adds mongoid query that matches every record when rule.conditions.empty? is true
2011-05-10 11:52:29 -04:00
parent ff13a82dda
commit ad62d60b20
2 changed files with 11 additions and 2 deletions
@@ -23,14 +23,14 @@ module CanCan
      end

      def database_records
-        if @rules.size == 0  
+        if @rules.size == 0
          @model_class.where(:_id => {'$exists' => false, '$type' => 7}) # return no records in Mongoid
        elsif @rules.size == 1 && @rules[0].conditions.is_a?(Mongoid::Criteria)
          @rules[0].conditions
        else
          @rules.inject(@model_class.all) do |records, rule|
            if rule.conditions.empty?
-              records
+              records.or(:_id => {'$exists' => true}) # match everything in Mongoid
            elsif rule.base_behavior
              records.or(rule.conditions)
            else