diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
commit | 21187c0fb4fc559927a2f947f909dedd85969ffb (patch) | |
tree | efd0ceb5c3a88531916186e97aa106041c293975 /railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb | |
parent | b5419cd66ea160d1ee94f3ca521bb44adf3a21ca (diff) | |
download | rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.gz rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.bz2 rails-21187c0fb4fc559927a2f947f909dedd85969ffb.zip |
Apply the rest of Chads patch
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb')
-rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb index 4ca12d622f..413f7f7ccb 100644 --- a/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb +++ b/railties/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb @@ -5,7 +5,7 @@ class <%= controller_class_name %>Controller < ApplicationController @<%= table_name %> = <%= class_name %>.find(:all) respond_to do |format| - format.html # index.rhtml + format.html # index.erb format.xml { render :xml => @<%= table_name %>.to_xml } end end @@ -16,7 +16,7 @@ class <%= controller_class_name %>Controller < ApplicationController @<%= file_name %> = <%= class_name %>.find(params[:id]) respond_to do |format| - format.html # show.rhtml + format.html # show.erb format.xml { render :xml => @<%= file_name %>.to_xml } end end |