active_scaffold 4.0.11 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f2b257dfe96b6225d421aed169b5909fc38860f42e7fcbc2686cf85023ce01
-  data.tar.gz: 8fdb80d250229b5548f81f4c86023cfd78c73e23c2fe7d6d02296d9188ace1f0
+  metadata.gz: 4fd3e750e0fb36959f8ac173dbb8f9ef3cffadaa1c4b7c7b66698ae97ae0da4e
+  data.tar.gz: 73ac2a464d935b187982282547440f450761d580cfd9e202601da5768670940a
 SHA512:
-  metadata.gz: 5ff4509249d50b3cf874ec89685a77fa7c9360a2e8bb48a97044a730433428592073e879d514be3361857ae765d99f1a7cae26eaa9a163bb99db384e3b906030
-  data.tar.gz: ca005e86b98e2748d95fd0a773d3eb004652dcc3fa3da4cd9b016b570b82e734ff2dca5eaaad534c7eadbbc10e030c53f8c2e437db6e9cee32329e6c77d848c7
+  metadata.gz: 5587b3cede0b77dfbc0194860fa7116f0f6e79ccc6647aa6e2a7f1a256bd107d19909c3b71d717497f7e0562fc6850ec3b829a7d27bc88ff4d24692125571639
+  data.tar.gz: a2d8672b60eb934851a1df4b57fb6928d1662e5924d6d78b1e06714db9e15ded2c48287d87382c4af2a1f1db0762b7e7d9b063ecfabc368ab4c66e322d246598

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 4.0.13
+- Fix security_methods on destroy_existing
+
+= 4.0.12.2
+- Filter includes for the selected model in select form_ui when column is a polymorphic association, as includes for polymorphic association may be a hash with the polymorphic association as key and associations of different models in the value
+
 = 4.0.11
 - Fix refresh_link with update_columns
 

data/lib/active_scaffold/actions/nested.rb

@@ -144,8 +144,8 @@ module ActiveScaffold::Actions::Nested
       unless config.action_links['destroy_existing']
         config.action_links.add('destroy_existing', label: :remove, type: :member, confirm: :are_you_sure_to_delete,
                                                     method: :delete, position: false,
-                                                    security_method: :add_existing_authorized?,
-                                                    ignore_method: :add_existing_ignore?)
+                                                    security_method: :delete_existing_authorized?,
+                                                    ignore_method: :delete_existing_ignore?)
       end
       config.action_links['destroy'].ignore_method = :habtm_delete_ignore? if config.actions.include?(:delete)
     end

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -36,8 +36,8 @@ module ActiveScaffold
           relation = klass.where(conditions)
           column = column_for_association(association, record)
           if column&.includes
-            include_assoc = column.includes.find { |assoc| assoc.is_a?(Hash) && assoc.include?(association.name) }
-            relation = relation.includes(include_assoc[association.name]) if include_assoc
+            include_assoc = includes_for_association(column, klass)
+            relation = relation.includes(include_assoc) if include_assoc
           end
           if column&.sort && column.sort&.dig(:sql)
             # with threasafe enabled, column.sort[:sql] returns proxied strings and
@@ -49,6 +49,24 @@ module ActiveScaffold
         end
       end
 
+      def includes_for_association(column, klass)
+        includes = column.includes.find { |assoc| assoc.is_a?(Hash) && assoc.include?(column.association.name) }
+        return unless includes
+
+        includes = includes[column.association.name]
+        if column.association.polymorphic?
+          includes = Array.wrap(includes).filter_map do |assoc|
+            if assoc.is_a?(Hash)
+              assoc.select { |key, _| klass.reflect_on_association(key) }.presence
+            elsif klass.reflect_on_association(assoc)
+              assoc
+            end
+          end
+        end
+
+        includes.presence
+      end
+
       def column_for_association(association, record)
         active_scaffold_config_for(record.class).columns[association.name]
       rescue StandardError => e

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 11
+    PATCH = 13
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 4.0.13
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails