active_scaffold 3.6.13 → 3.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15e01c11227052618d2b92ad709cfa1197de5ce2d088fb1f5d808f831714ae3
-  data.tar.gz: 64dcb127193bf37114da0d406d514f3091cca7b6295841134a0d9d939c5344f9
+  metadata.gz: 79509054cd67e6f4f1313ed2ee14a1f9eb64306cfbc3e20f5385af23f44edc90
+  data.tar.gz: 2490e6858effd4cb04634f8bebf868318dc807ef01cc3f1b7f9b4b34652f2f9f
 SHA512:
-  metadata.gz: 86fc673e0a500a8b7734ddb8cde6ebf309f22f6781f60df385e1a715d2218fb120bc2e54ce0fd4befd0ee94093d5e0c6ada201258240f98212eb7f492e68342d
-  data.tar.gz: 9be0d09ab6ad138c3e27ba3d2dba898ad7d72e53005cc1dbab56c4655ce9499dd2aea6afb9450493248ab450be7209fd1d8d9e5bda67f529a70ec42989c90cef
+  metadata.gz: 5719da364b955e1fce7c1f1e7fc383a4ada1313a69334c6bfddfc1960a1960d5aa05ed6b6054d7eba52390d7b70984930b84dc06162d96ffca01565c15dacbd4
+  data.tar.gz: cc9ed4db3c9c24b741a2fee4ee1f38dfa636ea607190c66b0d2e9fb99685b542bda602093945427defc47c22a24f726503e017ab65c17e03b3b63d093a29e461

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+- Fix setting data on html_options when threadsafe is enabled
+- Fill nested association on render field, as done in new action
+
 = 3.6.13
 - Fix link caching on action when threadsafe is enabled
 

data/lib/active_scaffold/actions/core.rb

@@ -92,12 +92,14 @@ module ActiveScaffold::Actions
       record = new_model
       copy_attributes(saved_record, record) if saved_record
       apply_constraints_to_record(record) unless scope
+      create_association_with_parent record, true if nested?
       update_record_from_params(record, columns, attributes || {}, true)
     end
 
     def updated_record_with_column(column, value, scope)
       record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
+      create_association_with_parent record, true if nested?
       value = column_value_from_param_value(record, column, value)
       record.send "#{column.name}=", value
       record.id = params[:id]

data/lib/active_scaffold/actions/nested.rb

@@ -124,8 +124,9 @@ module ActiveScaffold::Actions
       nested.child_association && nested_parent_record
     end
 
-    def create_association_with_parent(record)
+    def create_association_with_parent(record, check_match = false)
       return unless create_association_with_parent?
+      return if check_match && !nested.match_model?(active_scaffold_config.model)
       if nested.child_association.singular?
         record.send("#{nested.child_association.name}=", nested_parent_record)
       elsif nested.association.through_singular? && nested.child_association.through_singular?

data/lib/active_scaffold/actions/subform.rb

@@ -13,9 +13,7 @@ module ActiveScaffold::Actions
       parent_record = new_model
       # don't apply if scope, subform inside subform, because constraints won't apply to parent_record
       apply_constraints_to_record parent_record unless @scope
-      if nested? && nested.match_model?(active_scaffold_config.model)
-        create_association_with_parent parent_record
-      end
+      create_association_with_parent parent_record, true if nested?
       parent_record
     end
 

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -335,6 +335,7 @@ module ActiveScaffold
         html_options[:method] = link.method if link.method != :get
 
         html_options[:data] ||= {}
+        html_options[:data] = html_options[:data].deep_dup if html_options[:data].frozen?
         html_options[:data][:confirm] = link.confirm(h(record&.to_label)) if link.confirm?
         if !options[:page] && !options[:popup] && (options[:inline] || link.inline?)
           html_options[:class] << ' as_action'

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 13
+    PATCH = 14
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.13
+  version: 3.6.14
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails