kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #8887 from rwz/controller-scaffold-codestyle

Browse source 
Controller scaffold codestyle
This commit is contained in:
Rafael Mendonça França 2013-01-10 19:29:45 -08:00
commit 563ebedba3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
View file

@ -10,7 +10,7 @@ module Rails
class_option :stylesheet_engine, desc: "Engine for Stylesheets"
def handle_skip
@options = @options.merge(stylesheet_engine: false) if !options[:stylesheets]
@options = @options.merge(stylesheet_engine: false) unless options[:stylesheets]
end
hook_for :scaffold_controller, required: true

4
railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
View file

@ -31,7 +31,7 @@ class <%= controller_class_name %>Controller < ApplicationController
if @<%= orm_instance.save %>
redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
else
render action: "new"
render action: 'new'
end
end
@ -40,7 +40,7 @@ class <%= controller_class_name %>Controller < ApplicationController
if @<%= orm_instance.update("#{singular_table_name}_params") %>
redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
else
render action: "edit"
render action: 'edit'
end
end

2
railties/test/generators/scaffold_controller_generator_test.rb
View file

@ -162,7 +162,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
def test_new_hash_style
run_generator
assert_file "app/controllers/users_controller.rb" do |content|
assert_match(/render action: "new"/, content)
assert_match(/render action: 'new'/, content)
end
end
end