aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2012-08-25 01:43:30 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2012-09-16 23:58:21 -0500
commit978c568a7bffe354180aaefa471092182fed1015 (patch)
tree8da9bca8579dd90ebbe4a1d6258a12b8fe6479d0
parent1fa4f9243d09b3872a110c1057a828a753822728 (diff)
downloadrails-978c568a7bffe354180aaefa471092182fed1015.tar.gz
rails-978c568a7bffe354180aaefa471092182fed1015.tar.bz2
rails-978c568a7bffe354180aaefa471092182fed1015.zip
Change scaffold_generator: Don't use #require or #permit in scaffold if attributes list isn't given
-rw-r--r--railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb4
1 files changed, 4 insertions, 0 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 32f661278e..5d038d20e7 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -91,7 +91,11 @@ class <%= controller_class_name %>Controller < ApplicationController
# Use this method to whitelist the permissible parameters. Example: params.require(:person).permit(:name, :age)
# Also, you can specialize this method with per-user checking of permissible attributes.
def <%= "#{singular_table_name}_params" %>
+ <%- if attributes.empty? -%>
+ params[<%= ":#{singular_table_name}" %>]
+ <%- else -%>
params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes.map {|a| ":#{a.name}" }.sort.join(', ') %>)
+ <%- end -%>
end
end
<% end -%>