Generators use *.html.erb view template naming. Closes #8278.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6690 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb b/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb
index 502df6a567..a10f7f12b3 100644
--- a/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb
@@ -41,13 +41,13 @@ class ScaffoldResourceGenerator < Rails::Generator::NamedBase
 
       for action in scaffold_views
         m.template(
-          "view_#{action}.erb",
-          File.join('app/views', controller_class_path, controller_file_name, "#{action}.erb")
+          "view_#{action}.html.erb",
+          File.join('app/views', controller_class_path, controller_file_name, "#{action}.html.erb")
         )
       end
 
       # Layout and stylesheet.
-      m.template('layout.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.erb"))
+      m.template('layout.html.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
       m.template('style.css', 'public/stylesheets/scaffold.css')
 
       m.template('model.rb', File.join('app/models', class_path, "#{file_name}.rb"))