Rails 3 compatible.

activeadmin · Feb 6, 2010 · 4c0f8e2 · 4c0f8e2
1 parent c3e625b
commit 4c0f8e2
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 561 deletions.
diff --git a/lib/inherited_resources.rb b/lib/inherited_resources.rb
@@ -1,11 +1,3 @@
-# respond_to is the only file that should be loaded before hand. All others
-# are loaded on demand.
-#
-unless defined?(ActionController::Responder)
-  require 'inherited_resources/legacy/responder'
-  require 'inherited_resources/legacy/respond_to'
-end
-
 require 'responders'
 I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'inherited_resources', 'locales', 'en.yml'))
 
@@ -30,8 +22,6 @@ def self.flash_keys=(array)
 end
 
 class ActionController::Base
-  public :flash, :render
-
   # If you cannot inherit from InheritedResources::Base you can call
   # inherit_resource in your controller to have all the required modules and
   # funcionality included.

diff --git a/lib/inherited_resources/base.rb b/lib/inherited_resources/base.rb
@@ -12,10 +12,7 @@ module InheritedResources
   # or overwrite some helpers in the base_helpers.rb file.
   #
   class Base < ::ApplicationController
-    unloadable
-
     # Overwrite inherit_resources to add specific InheritedResources behavior.
-    #
     def self.inherit_resources(base)
       base.class_eval do
         include InheritedResources::Actions

diff --git a/lib/inherited_resources/legacy/respond_to.rb b/lib/inherited_resources/legacy/respond_to.rb