Add --no-html to scaffold generator

1 files changed, 12 insertions, 1 deletions

diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
index 60d202c5ef..dd636ed3cf 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -9,6 +9,15 @@ module Rails
       class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
       class_option :stylesheet_engine, desc: "Engine for Stylesheets"
 
+      class_option :html, type: :boolean, default: true,
+                          desc: "Generate a scaffold with HTML output"
+
+      def handle_skip
+        if !options[:html] || !options[:stylesheets]
+          @options = @options.merge(stylesheet_engine: false)
+        end
+      end
+
       hook_for :scaffold_controller, required: true
 
       hook_for :assets do |assets|
@@ -16,7 +25,9 @@ module Rails
       end
 
       hook_for :stylesheet_engine do |stylesheet_engine|
-        invoke stylesheet_engine, [controller_name] if options[:stylesheets] && behavior == :invoke
+        if behavior == :invoke
+          invoke stylesheet_engine, [controller_name]
+        end
       end
     end
   end