diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-12-13 20:57:51 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-12-13 20:57:51 +0100 |
| commit | 02eef9459a19f263b30d8d032017c05bfc97d00b (patch) | |
| tree | a30e1cb03416c712b412f495358b0fbc1a65e14a /railties/lib/rails | |
| parent | 8404aa2a72a1aa03b6177d00c21612f09f23b8c8 (diff) | |
| parent | c83ace7b6a5720be30a2f7d843d545fc81af54cd (diff) | |
| download | rails-02eef9459a19f263b30d8d032017c05bfc97d00b.tar.gz rails-02eef9459a19f263b30d8d032017c05bfc97d00b.tar.bz2 rails-02eef9459a19f263b30d8d032017c05bfc97d00b.zip | |
Merge pull request #22574 from gsamokovarov/scaffold-500
Prevent a 500 in the default controller scaffold
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb index 17a86f376b..400afec6dc 100644 --- a/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb @@ -52,7 +52,7 @@ class <%= controller_class_name %>Controller < ApplicationController # Only allow a trusted parameter "white list" through. def <%= "#{singular_table_name}_params" %> <%- if attributes_names.empty? -%> - params[:<%= singular_table_name %>] + params.fetch(:<%= singular_table_name %>, {}) <%- else -%> params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>) <%- end -%> 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 f73e9a96ba..42b9e34274 100644 --- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb @@ -59,7 +59,7 @@ class <%= controller_class_name %>Controller < ApplicationController # Only allow a trusted parameter "white list" through. def <%= "#{singular_table_name}_params" %> <%- if attributes_names.empty? -%> - params[:<%= singular_table_name %>] + params.fetch(:<%= singular_table_name %>, {}) <%- else -%> params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>) <%- end -%> |