active_scaffold 3.6.12 → 3.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e719c9e6003904fa2f7765e1f5d5c2dc691fe6fe662bd07277e056f304c597
-  data.tar.gz: b2901dfbd786c90000ba12970baa056324caefc60810c8883166b47abf7079ec
+  metadata.gz: 79509054cd67e6f4f1313ed2ee14a1f9eb64306cfbc3e20f5385af23f44edc90
+  data.tar.gz: 2490e6858effd4cb04634f8bebf868318dc807ef01cc3f1b7f9b4b34652f2f9f
 SHA512:
-  metadata.gz: 0e020933f2fa31d3922a0066cac2bf85c00be4f1424a4bbd6b7544e472af3e7c5f2896290d0bc270af943a4137cbfe937ddee349efa97d8df328f0e1954eba45
-  data.tar.gz: acef80c0ff55cd921a72b52384514e05106eb4c842fcd5fad942e952513586fad8f3e79f805e52cf83e9254676ea221efc0877f88b9ad822af82717759014f8b
+  metadata.gz: 5719da364b955e1fce7c1f1e7fc383a4ada1313a69334c6bfddfc1960a1960d5aa05ed6b6054d7eba52390d7b70984930b84dc06162d96ffca01565c15dacbd4
+  data.tar.gz: cc9ed4db3c9c24b741a2fee4ee1f38dfa636ea607190c66b0d2e9fb99685b542bda602093945427defc47c22a24f726503e017ab65c17e03b3b63d093a29e461

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+- 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
+
 = 3.6.12
 - Fix getting proxy for action link when iterating over action links and threadsafe is enabled, so link can be changed
 

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

@@ -167,10 +167,10 @@ module ActiveScaffold
 
       def cached_action_link_url(link, record)
         @action_links_urls ||= {}
-        @action_links_urls[link.name_to_cache] || begin
+        @action_links_urls[link.name_to_cache.to_s] || begin
           url_options = cached_action_link_url_options(link, record)
           if cache_action_link_url?(link, record)
-            @action_links_urls[link.name_to_cache] = url_for(url_options)
+            @action_links_urls[link.name_to_cache.to_s] = url_for(url_options)
           else
             url_options.merge! eid: nil, embedded: nil if link.nested_link?
             url_for(params_for(url_options))
@@ -207,7 +207,7 @@ module ActiveScaffold
 
       def action_link_url(link, record)
         url = replace_id_params_in_action_link_url(link, record, cached_action_link_url(link, record))
-        url = add_query_string_to_cached_url(link, url) if @action_links_urls[link.name_to_cache]
+        url = add_query_string_to_cached_url(link, url) if @action_links_urls[link.name_to_cache.to_s]
         url
       end
 
@@ -267,10 +267,10 @@ module ActiveScaffold
 
       def cached_action_link_url_options(link, record)
         @action_links_url_options ||= {}
-        @action_links_url_options[link.name_to_cache] || begin
+        @action_links_url_options[link.name_to_cache.to_s] || begin
           options = action_link_url_options(link, record)
           if cache_action_link_url_options?(link, record)
-            @action_links_url_options[link.name_to_cache] = options
+            @action_links_url_options[link.name_to_cache.to_s] = options
           end
           options
         end
@@ -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'
@@ -378,7 +379,7 @@ module ActiveScaffold
             end
         end
         id ||= record&.id&.to_s || (nested? ? nested_parent_id.to_s : '')
-        action_link_id = ActiveScaffold::Registry.cache :action_link_id, link.name_to_cache do
+        action_link_id = ActiveScaffold::Registry.cache :action_link_id, link.name_to_cache.to_s do
           action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
           action_link_id(action_id, '--ID--')
         end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 12
+    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.12
+  version: 3.6.14
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails