aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-09-23 09:45:32 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-09-23 09:45:32 -0700
commit09d298eeccd46857dd018aea7ba0a880640cc289 (patch)
treef70848c05d513d5a730b39b15ad05f329672a3d0 /railties/lib/rails
parentd9b873c4289c1e0dc1bf1d644fa827b600fb0893 (diff)
parent5a76d08733da72cf1ee808a38304a9927e734765 (diff)
downloadrails-09d298eeccd46857dd018aea7ba0a880640cc289.tar.gz
rails-09d298eeccd46857dd018aea7ba0a880640cc289.tar.bz2
rails-09d298eeccd46857dd018aea7ba0a880640cc289.zip
Merge pull request #7740 from BMorearty/dont-sort-params
Removed sorting of attribute names in controller generator.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb2
1 files changed, 1 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 5d038d20e7..d6bce40b0c 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -94,7 +94,7 @@ class <%= controller_class_name %>Controller < ApplicationController
<%- if attributes.empty? -%>
params[<%= ":#{singular_table_name}" %>]
<%- else -%>
- params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes.map {|a| ":#{a.name}" }.sort.join(', ') %>)
+ params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes.map {|a| ":#{a.name}" }.join(', ') %>)
<%- end -%>
end
end