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

merging with master and resolving a couple conflicts

Browse Source
This commit is contained in:
Ryan Bates
2010-07-19 16:36:01 -07:00
parent 75eb1917f9 cad425989e
commit 5d8f04363d
6 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cancan/ability.rb
View File

@@ -267,6 +267,15 @@ module CanCan
end
private
# Accepts a hash of aliased actions and returns an array of actions which match.
# This should be called before "matches?" and other checking methods since they
# rely on the actions to be expanded.
def expand_actions(actions)
actions.map do |action|
aliased_actions[action] ? [action, *expand_actions(aliased_actions[action])] : action
end.flatten
end
def can_definitions
@can_definitions ||= []
@@ -275,7 +284,7 @@ module CanCan
def matching_can_definition(action, subject)
if block_given?
can_definitions.reverse.each do |can_definition|
can_definition.expand_actions(aliased_actions)
can_definition.expanded_actions = expand_actions(can_definition.actions)
if can_definition.matches? action, subject
yield can_definition
break if can_definition.definitive?