Merge branch 'inherited_resources_collection_fix' of https://github.com/tanordheim/cancan into tanordheim-inherited_resources_collection_fix

2011-03-08 15:24:14 -08:00
parent bcf2756ad2 e3eab13b86
commit 28a9a0ac07
2 changed files with 3 additions and 3 deletions
--- a/lib/cancan/inherited_resource.rb
+++ b/lib/cancan/inherited_resource.rb
@@ -12,7 +12,7 @@ module CanCan
    end

    def resource_base
-      @controller.send :end_of_association_chain
+      @controller.send :collection
    end
  end
 end