aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-01-08 19:31:04 +0100
committerGitHub <noreply@github.com>2017-01-08 19:31:04 +0100
commitee47aab757b21740372441ff7d77b63201cb432d (patch)
tree45fe6e5681c777dc68121da15bd3dc93fa48bff7 /railties/lib/rails/generators
parent80bf3384152a640a36682db875241e2d92db511f (diff)
parentb05fec04e9d74850cc5ad93a82e31bc6a74b4f71 (diff)
downloadrails-ee47aab757b21740372441ff7d77b63201cb432d.tar.gz
rails-ee47aab757b21740372441ff7d77b63201cb432d.tar.bz2
rails-ee47aab757b21740372441ff7d77b63201cb432d.zip
Merge pull request #27604 from prathamesh-sonpatki/dont-generate-erb-views-for-api-scaffold-controller
Don't generate HTML/ERB templates for scaffold controller with --api flag
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index e4f3161ffd..4cc1e2d0fd 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -20,7 +20,12 @@ module Rails
template template_file, File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
end
- hook_for :template_engine, :test_framework, as: :scaffold
+
+ hook_for :template_engine, as: :scaffold do |template_engine|
+ invoke template_engine unless options.api?
+ end
+
+ hook_for :test_framework, as: :scaffold
# Invoke the helper using the controller name (pluralized)
hook_for :helper, as: :scaffold do |invoked|