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

checks if active record responds to 'joins', so this can work with internuity's quick_scopes gem; added .swp files to git ignore

Browse Source
This commit is contained in:
Ramon Tayag 2010-11-02 10:57:45 +08:00 committed by Ryan Bates
parent 79180de372
commit cf263c105d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
*.swp
**/*.swp
*.gem *.gem
Gemfile.lock Gemfile.lock
.bundle .bundle

2
lib/cancan/active_record_additions.rb
View File

@ -21,7 +21,7 @@ module CanCan
# internally uses Ability#conditions method, see that for more information. # internally uses Ability#conditions method, see that for more information.
def accessible_by(ability, action = :read) def accessible_by(ability, action = :read)
query = ability.query(action, self) query = ability.query(action, self)
if respond_to? :where if respond_to?(:where) && respond_to?(:joins)
where(query.conditions).joins(query.joins) where(query.conditions).joins(query.joins)
else else
scoped(:conditions => query.conditions, :joins => query.joins) scoped(:conditions => query.conditions, :joins => query.joins)