Merge git://github.com/josevalim/inherited_resources

AlexParamonov · Jan 18, 2011 · 89bfe61 · 89bfe61
2 parents eb7af82 + 8525d00
commit 89bfe61
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/inherited_resources.rb b/lib/inherited_resources.rb
@@ -22,7 +22,11 @@ def self.flash_keys=(array)
 
   class Railtie < ::Rails::Railtie
     config.inherited_resources = InheritedResources
-    config.generators.scaffold_controller = :inherited_resources_controller
+    if config.respond_to?(:app_generators)
+      config.app_generators.scaffold_controller = :inherited_resources_controller
+    else
+      config.generators.scaffold_controller = :inherited_resources_controller
+    end
   end
 end