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

When using an existing scope, it should be merged properly to the class. May fix ryanb/cancan#328 :)

Browse Source
This commit is contained in:
Florent Piteau 2011-04-01 21:25:19 +02:00
parent 81f00f9024
commit a10243a569
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cancan/model_adapters/active_record_adapter.rb
View File

@ -87,7 +87,7 @@ module CanCan
def database_records
if override_scope
override_scope
@model_class.scoped.merge(override_scope)
elsif @model_class.respond_to?(:where) && @model_class.respond_to?(:joins)
@model_class.where(conditions).joins(joins)
else

2
spec/cancan/model_adapters/active_record_adapter_spec.rb
View File

@ -125,7 +125,7 @@ if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
Article.accessible_by(@ability).should == [article1]
end
it "should only fetch associated records for nested controllers" do
it "should fetch only associated records when using with a scope for conditions" do
@ability.can :read, Article, Article.where(:secret => true)
category1 = Category.create!(:visible => false)
category2 = Category.create!(:visible => true)