Merge branch '4-0-stable'

Author: scambra

CHANGELOG.rdoc

@@ -14,6 +14,9 @@
 - Rename active_scaffold_habtm_joins to active_scaffold_joins, active_scaffold_habtm_joins is now deprecated
 - Support sorted_association_options_find with model name prefix
 
+= 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
 

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_scaffold (4.0.12.2)
+    active_scaffold (4.0.13)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       rails (>= 5.2.0)

gemfiles/Gemfile.rails-7.0.x.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_scaffold (4.0.12.2)
+    active_scaffold (4.0.13)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       rails (>= 5.2.0)

gemfiles/Gemfile.rails-7.1.x.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_scaffold (4.0.12.2)
+    active_scaffold (4.0.13)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       rails (>= 5.2.0)

gemfiles/Gemfile.rails-7.2.x.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_scaffold (4.0.12.2)
+    active_scaffold (4.0.13)
       dartsass-sprockets (~> 3.2.0)
       ice_nine (~> 0.11)
       rails (>= 5.2.0)

lib/active_scaffold/actions/nested.rb

@@ -144,8 +144,8 @@ def self.include_habtm_actions(config)
       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

lib/active_scaffold/version.rb

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