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

ignore cannot clause with attributes when not checking for with attributes - closes #406

Browse Source
This commit is contained in:
Ryan Bates 2011-09-28 14:48:26 -07:00
parent aa83fee7a4
commit 1fb2c0160c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cancan/rule.rb
View File

@ -97,8 +97,13 @@ module CanCan
end end
def matches_attribute?(attribute) def matches_attribute?(attribute)
# don't consider attributes in a cannot clause when not matching - this can probably be refactored
if !@base_behavior && @attributes && attribute.nil?
false
else
@attributes.nil? || attribute.nil? || @attributes.include?(attribute.to_sym) @attributes.nil? || attribute.nil? || @attributes.include?(attribute.to_sym)
end end
end
# TODO deperecate this # TODO deperecate this
def matches_subject_class?(subject) def matches_subject_class?(subject)

1
spec/cancan/ability_spec.rb
View File

@ -345,6 +345,7 @@ describe CanCan::Ability do
@ability.can?(:update, :books, :author).should be_false @ability.can?(:update, :books, :author).should be_false
end end
# Hash Association # Hash Association
it "checks permission through association when hash is passed as subject" do it "checks permission through association when hash is passed as subject" do