BACKWARDS INCOMPATIBLE: use Ability#initialize instead of 'prepare' to set up abilities - closes #4
This commit is contained in:
@@ -47,9 +47,5 @@ module CanCan
|
||||
:update => [:edit],
|
||||
}
|
||||
end
|
||||
|
||||
def prepare(user)
|
||||
# to be overriden by included class
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -9,9 +9,7 @@ module CanCan
|
||||
end
|
||||
|
||||
def current_ability
|
||||
ability = ::Ability.new
|
||||
ability.prepare(current_user)
|
||||
ability
|
||||
::Ability.new(current_user)
|
||||
end
|
||||
|
||||
def can?(*args)
|
||||
@@ -43,4 +41,4 @@ if defined? ActionController
|
||||
ActionController::Base.class_eval do
|
||||
include CanCan::ControllerAdditions
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user