Fix always use build associated

CHANGELOG

@@ -19,6 +19,7 @@
 - Display count items when pagination is disabled
 - Check security in column groups in forms
 - Add refresh_link option to :select form_ui
+- Always create subrecords via build_associated
 
 = 3.3.3
 - Allow to override select options in active_scaffold_search_select

lib/active_scaffold/attribute_params.rb

@@ -173,7 +173,7 @@ def find_or_create_for_params(params, parent_column, parent_record)
       if params.has_key? klass.primary_key
         record_from_current_or_find(klass, params[klass.primary_key], current)
       elsif klass.authorized_for?(:crud_type => :create)
-        parent_column.association.klass.new
+        build_associated(parent_column.association, parent_record)
       end
     end
 

lib/active_scaffold/helpers/controller_helpers.rb

@@ -100,6 +100,10 @@ def build_associated(association, parent_record)
           # avoid use build_association in has_one when record is saved and had associated record
           # because associated record would be changed in DB
           parent_record.send("build_#{association.name}")
+        elsif association.macro == :has_one && parent_record.persisted? && parent_record.send(association.name).present?
+          association.klass.new.tap do |record|
+            parent_record.send("#{association.name}=", record)
+          end
         else
           association.klass.new.tap do |record|
             save_record_to_association(record, association.reverse, parent_record) # set inverse
@@ -109,3 +113,4 @@ def build_associated(association, parent_record)
     end
   end
 end
+

test/misc/attribute_params_test.rb

@@ -168,8 +168,8 @@ def test_saving_has_many_crud_and_belongs_to_select
     model = update_record_from_params(Building.new, :create, :name, :floors, :name => 'First', :floors => floors)
     assert_equal 'First', model.name
     assert_equal 3, model.floors.size
-    assert_equal floor.id, model.floors.first.id
-    assert_equal [nil, *people.map(&:id)], model.floors.map(&:tenant_id)
+    assert_equal floor.id, model.floors.last.id
+    assert_equal [*people.map(&:id), nil], model.floors.map(&:tenant_id)
     assert model.save
 
     model = update_record_from_params(model, :update, :name, :floors, :name => 'Tower', :floors => {'0' => ''})
@@ -301,3 +301,4 @@ def logger
     @logger ||= Logger.new(STDOUT)
   end
 end
+