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

don't pass action into can block with :manage option - closes #129

Browse Source
This commit is contained in:
Ryan Bates
2010-09-02 14:29:49 -07:00
parent 6105edc6a7
commit b1fb179aaf
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cancan/can_definition.rb
View File

@@ -26,7 +26,7 @@ module CanCan
# Matches the block or conditions hash
def matches_conditions?(action, subject, extra_args)
if @block && subject.class != Class
call_block(action, subject, extra_args)
@block.call(subject, *extra_args)
elsif @conditions.kind_of?(Hash) && subject.class != Class
matches_conditions_hash?(subject)
else
@@ -91,13 +91,5 @@ module CanCan
end
end
end
def call_block(action, subject, extra_args)
block_args = []
block_args << action if @expanded_actions.include?(:manage)
block_args << (subject.class == Class ? nil : subject)
block_args += extra_args
@block.call(*block_args)
end
end
end