Changed API of NestedAttributes to take an array, or hash with index keys, of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
[#1892 state:committed]

1 files changed, 18 insertions, 8 deletions

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 3925978217..568687e9e0 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -964,24 +964,34 @@ module ActionView
         def fields_for_with_nested_attributes(association_name, args, block)
           name = "#{object_name}[#{association_name}_attributes]"
           association = @object.send(association_name)
+          explicit_object = args.first if args.first.respond_to?(:new_record?)
 
           if association.is_a?(Array)
-            children = args.first.respond_to?(:new_record?) ? [args.first] : association
+            children = explicit_object ? [explicit_object] : association
+            explicit_child_index = args.last[:child_index] if args.last.is_a?(Hash)
 
             children.map do |child|
-              child_name = "#{name}[#{ child.new_record? ? new_child_id : child.id }]"
-              @template.fields_for(child_name, child, *args, &block)
+              fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index}]", child, args, block)
             end.join
           else
-            object = args.first.respond_to?(:new_record?) ? args.first : association
+            fields_for_nested_model(name, explicit_object || association, args, block)
+          end
+        end
+
+        def fields_for_nested_model(name, object, args, block)
+          if object.new_record?
             @template.fields_for(name, object, *args, &block)
+          else
+            @template.fields_for(name, object, *args) do |builder|
+              @template.concat builder.hidden_field(:id)
+              block.call(builder)
+            end
           end
         end
 
-        def new_child_id
-          value = (@child_counter ||= 1)
-          @child_counter += 1
-          "new_#{value}"
+        def nested_child_index
+          @nested_child_index ||= -1
+          @nested_child_index += 1
         end
     end
   end