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

2011-03-08 15:33:47 -08:00 · 2011-03-08 15:33:47 -08:00 · 2c2fa306cc
commit 2c2fa306cc
parent 28a9a0ac07 8722fbc7a5
1 changed files with 2 additions and 1 deletions
--- a/lib/cancan/inherited_resource.rb
+++ b/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