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

adding manage action which applies to everything

Browse Source
This commit is contained in:
Ryan Bates
2009-11-16 14:42:41 -08:00
parent 0cfb8c7c41
commit 6c89c32059
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/cancan/ability.rb
View File

@@ -6,21 +6,15 @@ module CanCan
def can?(action, target)
self.class.can_history.reverse.each do |can_action, can_target, can_block|
if can_action == action && (can_target == :all || can_target == target || target.kind_of?(can_target))
if (can_action == :manage || can_action == action) && (can_target == :all || can_target == target || target.kind_of?(can_target))
if can_block.nil?
return true
else
if can_target == :all
if target.class == Class
return can_block.call(target, nil)
else
return can_block.call(target.class, target)
end
elsif can_target == target
return can_block.call(nil)
else
return can_block.call(target)
end
block_args = []
block_args << action if can_action == :manage
block_args << (target.class == Class ? target : target.class) if can_target == :all
block_args << (target.class == Class ? nil : target)
return can_block.call(*block_args)
end
end
end