Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Avoid unnecessary sql execution #974

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Avoid unnecessary sql execution #974

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03c1473
Use scoped to avoid sql query execution
Dec 11, 2013
7d9a2d6
Avoid deprecation warning with AR 4
Dec 12, 2013
a8dfdb4
Update to pass specs
Dec 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/cancan/controller_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@ def collection_instance
def resource_base
if @options[:through]
if parent_resource
@options[:singleton] ? resource_class : parent_resource.send(@options[:through_association] || name.to_s.pluralize)
base = @options[:singleton] ? resource_class : parent_resource.send(@options[:through_association] || name.to_s.pluralize)
base = base.scoped if base.respond_to?(:scoped) && defined?(ActiveRecord) && ActiveRecord::VERSION::MAJOR == 3
base
elsif @options[:shallow]
resource_class
else
Expand Down