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

fixing mongoid 'or' error - closes #322

Browse Source
This commit is contained in:
Ryan Bates 2011-03-29 17:49:18 -07:00
parent fb8e9bde57
commit e96cf5bea4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cancan/model_adapters/mongoid_adapter.rb
View File

@ -20,7 +20,9 @@ module CanCan
@model_class.where(:_id => {'$exists' => false, '$type' => 7}) # return no records in Mongoid @model_class.where(:_id => {'$exists' => false, '$type' => 7}) # return no records in Mongoid
else else
@rules.inject(@model_class.all) do |records, rule| @rules.inject(@model_class.all) do |records, rule|
if rule.base_behavior if rule.conditions.empty?
records
elsif rule.base_behavior
records.or(rule.conditions) records.or(rule.conditions)
else else
records.excludes(rule.conditions) records.excludes(rule.conditions)