Permalink
Browse files

Merge branch 'master' of https://github.com/stefanoverna/cancan into …

…stefanoverna-master
  • Loading branch information...
ryanb committed Mar 8, 2011
2 parents 28a9a0a + 8722fbc commit 2c2fa306cc51b8520ad776f447ecdaeaed0f1c6d
Showing with 2 additions and 1 deletion.
  1. +2 −1 lib/cancan/inherited_resource.rb
@@ -3,7 +3,8 @@ module CanCan
class InheritedResource < ControllerResource # :nodoc:
def load_resource_instance
if parent?
@controller.send :parent
@controller.send :association_chain
@controller.instance_variable_get("@#{instance_name}")
elsif new_actions.include? @params[:action].to_sym
@controller.send :build_resource
else

0 comments on commit 2c2fa30

Please sign in to comment.