diff options
| author | Yehuda Katz <wycats@gmail.com> | 2012-12-22 23:05:39 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2012-12-22 23:05:53 -0800 |
| commit | a4d21f764c2e6ebea5f506aa0fe8db71e2969c54 (patch) | |
| tree | c73150c97336a098807490201f823eb246c580d6 /railties/lib/rails/generators | |
| parent | e738acd08052c73cd5b52cd8c706f6982ba1ca8c (diff) | |
| download | rails-a4d21f764c2e6ebea5f506aa0fe8db71e2969c54.tar.gz rails-a4d21f764c2e6ebea5f506aa0fe8db71e2969c54.tar.bz2 rails-a4d21f764c2e6ebea5f506aa0fe8db71e2969c54.zip | |
Fix spacing regression in scaffold generator
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb | 4 |
1 files changed, 3 insertions, 1 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 999a29b18d..4baad85e9e 100644 --- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb @@ -77,7 +77,9 @@ class <%= controller_class_name %>Controller < ApplicationController <%- end -%> format.json { head :no_content } else - <%- if options[:html] -%>format.html { render action: "edit" }<%- end -%> + <%- if options[:html] -%> + format.html { render action: "edit" } + <%- end -%> format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity } end end |