aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-03-14 14:36:15 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-03-14 14:47:20 -0300
commit2963ee6b4bbdb288de8a1245d4fbaa67dd256139 (patch)
treee6c03ef7283f79864bb4cb3150e940791b886d0f /railties/lib/rails
parentda074335783521737a12fe583157b3c35f9da5ed (diff)
downloadrails-2963ee6b4bbdb288de8a1245d4fbaa67dd256139.tar.gz
rails-2963ee6b4bbdb288de8a1245d4fbaa67dd256139.tar.bz2
rails-2963ee6b4bbdb288de8a1245d4fbaa67dd256139.zip
Fix scaffold controller template, ensure rake scaffold test pass by default
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index fd73835e1d..b95aea5f19 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -46,10 +46,10 @@ class <%= controller_class_name %>Controller < ApplicationController
respond_to do |format|
if @<%= orm_instance.save %>
format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> }
- format.json { render json: <%= "@#{singular_table_name}" %>, :status: :created, location: <%= "@#{singular_table_name}" %> }
+ format.json { render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %> }
else
format.html { render action: "new" }
- format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity %> }
+ format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
end
end
end