diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-08 16:52:24 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-08 16:52:24 -0300 |
| commit | ec69a45f5bb49c096f460a6bbe85d9d8890488b5 (patch) | |
| tree | ca56613443cda48267ca987420f61327ae6f0445 /railties/lib/rails | |
| parent | a69e0a5fcfbcd76f259ab1ed290fafa8726b44ba (diff) | |
| parent | 83b7bf4d3bdb4bc84cbbc5d2859951f5e534e2c2 (diff) | |
| download | rails-ec69a45f5bb49c096f460a6bbe85d9d8890488b5.tar.gz rails-ec69a45f5bb49c096f460a6bbe85d9d8890488b5.tar.bz2 rails-ec69a45f5bb49c096f460a6bbe85d9d8890488b5.zip | |
Merge pull request #20479 from masarakki/no-scaffold.css-option
add option to avoid generating scaffold.css
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index a7da92168d..79088bbe3c 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -33,6 +33,7 @@ module Rails scaffold_controller: '-c', stylesheets: '-y', stylesheet_engine: '-se', + scaffold_stylesheet: '-ss', template_engine: '-e', test_framework: '-t' }, @@ -56,6 +57,7 @@ module Rails scaffold_controller: :scaffold_controller, stylesheets: true, stylesheet_engine: :css, + scaffold_stylesheet: true, test_framework: false, template_engine: :erb } diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index e89789e72b..17c32bfdb3 100644 --- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -10,10 +10,11 @@ module Rails class_option :stylesheet_engine, desc: "Engine for Stylesheets" class_option :assets, type: :boolean class_option :resource_route, type: :boolean + class_option :scaffold_stylesheet, type: :boolean def handle_skip @options = @options.merge(stylesheets: false) unless options[:assets] - @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] + @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet] end hook_for :scaffold_controller, required: true |