提交 ad62d60b 编写于 作者: R Ryan Ahearn

Fixes bug in mongoid_adapter with empty conditions hash

* adds mongoid query that matches every record when
rule.conditions.empty? is true
上级 ff13a82d
......@@ -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
......
......@@ -68,6 +68,15 @@ if ENV["MODEL_ADAPTER"] == "mongoid"
MongoidProject.accessible_by(@ability, :read).entries.should == [sir]
end
it "should be able to mix empty conditions and hashes" do
@ability.can :read, MongoidProject
@ability.can :read, MongoidProject, :title => 'Sir'
sir = MongoidProject.create(:title => 'Sir')
lord = MongoidProject.create(:title => 'Lord')
MongoidProject.accessible_by(@ability, :read).count.should == 2
end
it "should return everything when the defined ability is manage all" do
@ability.can :manage, :all
sir = MongoidProject.create(:title => 'Sir')
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册