effective_resources 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4196a26392312c2343b4ae31d4580a7c8b84a8f37d8e74c77e17d34016314b9c
-  data.tar.gz: 93d48690d2be56b1f5068bf815055de47446599b82aaf4444e52583208f368b3
+  metadata.gz: 37818a2db37ab767ea5c415519b0674ba87cc5a998978730a7851df8fddeae1d
+  data.tar.gz: 89f53d6a3238db076a5c9b212ce306109954c1cea374f763b755b7b8ee565e5b
 SHA512:
-  metadata.gz: b25bc7b63e988fe7198cdd2e5b44d79cbee612fb18839b088feb7e3c53c6b00a8c27ac76f0de796278f147e93b27d64f374cae0c00e1419350146243cfc4f9ae
-  data.tar.gz: 159c99e620737423d67963b28feefa1bda55dfd645a25835892bded90a4d616dd52e659913f3f97f246c6274a5ad5cae615c33d43c795c576a8fe6465235487a
+  metadata.gz: ceb3fdb52931639ebb8ba24454dd103daa45dccc674d2d1dadb1a31d1e89da7f28f9a107a5db6e8dc38e2c688970366b3d36c9e189c78d7b5cca45555468e577
+  data.tar.gz: 1cea14061c7f0cc2bda9f56efd57f9be8b6018af50cdc72e8759d4ae80a120e5fcfceefea4da0908f95d3fc4161c4bf87d5472c69c93099ebd10137a5d5cb7b7

data/app/models/effective/resources/controller.rb

@@ -47,7 +47,6 @@ module Effective
             action_name = action.to_s.titleize
 
             if action == :destroy
-              next if buttons.values.find { |v| v[:action] == :archive }.present?
               buttons['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
               buttons[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }
@@ -101,7 +100,6 @@ module Effective
             action_name = action.to_s.titleize
 
             if action == :destroy
-              next if actions.find { |_, v| v[:action] == :archive }.present?
               actions['Delete'] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really delete @resource?" }
             else
               actions[action_name] = { action: action, default: true, 'data-method' => :delete, 'data-confirm' => "Really #{action_name} @resource?" }

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.15.0'.freeze
+  VERSION = '1.15.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails