Use the references and belongs_id ids in the scaffold_controller

generator

2 files changed, 10 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 08fe8a08e3..5fc93efc6d 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}" }.join(', ') %>)
+      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes.map { |a| ":#{a.index_name}" }.join(', ') %>)
       <%- end -%>
     end
 end
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 0498c4c3fd..f467043cd0 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -61,6 +61,15 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_controller_permit_references_attributes
+    run_generator ["LineItem", "product:references", "cart:belongs_to"]
+
+    assert_file "app/controllers/line_items_controller.rb" do |content|
+      assert_match(/def line_item_params/, content)
+      assert_match(/params\.require\(:line_item\)\.permit\(:product_id, :cart_id\)/, content)
+    end
+  end
+
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/