five-two-nw-olivander 0.1.2.33 → 0.1.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e8369317833a43657c260cc70760456db6b3cfe00fd07dfb0025cb60d6d97c
-  data.tar.gz: b3c5c50ec6df2e061e91f366b1bf3ac799189eb6da9b35cd2dc6ecff8985d58f
+  metadata.gz: 21de4f9aa55c8f41410166a668b724d89d0f7800adef266b6c6ded9b3d52a665
+  data.tar.gz: d4de2dfa99389c5df48c39cd8854f9ea3cb0a855f0ea11dfdb1e0cf5f9991e7d
 SHA512:
-  metadata.gz: 724bf34bce912308d9c9c7567af14704e08a19393d4724325e5af7db4990ce63bbbc97f399fad5dca0f18b8ad1ec6590f8106b5612994784d1206f2cef996e4f
-  data.tar.gz: 82a7fc7c07cc0edf46ea06cb6c85c93fa0fced741b9ebdf8572d3ff21838b1403ea206fde329417a1de2803dbc269e86055c87c4ac8eb71fe45afa20bf1b1fff
+  metadata.gz: c9e38f0a1c8fd0802f26b47fa0d889e354f57baa56bfb62cd1b07b29e670112410dd23eb1b55765ecaedfbe15a50a5b1927ee67ca40826c6b57773a7d28bdf3f
+  data.tar.gz: 90e0d42e5a80bfc5a2dac29ac6f26e8091dc697daa3868646422b343ee5dee495455933960504e77b777e12d20ff298a2fb4cba8c6f7870a16f25b96f752eb08

data/app/helpers/olivander/application_helper.rb

@@ -34,7 +34,9 @@ module Olivander
             arr << a if a.sym == p
           end
         end
-        arr &&= actions.reject{ |x| preferred.include?(x.sym) }
+        actions.reject{ |x| preferred.include?(x.sym) }.each do |a|
+          arr << a
+        end
       end
     end
 

data/app/views/application/_resource_form_actions.html.haml

@@ -1,7 +1,15 @@
-- actions.each do |a|
-  = link_to({ controller: a.controller, action: a.action }, method: a.verb, class: 'btn btn-tool', data: { turbo: true }) do
+- actions.each_with_index do |a, idx|
+  - cf_sym = "link_inner#{idx}".to_sym
+  = content_for cf_sym do
     - icon_key = "activerecord.actions.icons.#{a.sym}"
     - if I18n.exists?(icon_key)
       %i.fa{ class: I18n.t(icon_key)}
     = resource_form_action_label(@resource, a.sym)
+
+  - if a.turbo_frame.blank?
+    = link_to({ controller: a.controller, action: a.action }, method: a.verb, class: 'btn btn-tool') do
+      = yield cf_sym
+  - else
+    = link_to({ controller: a.controller, action: a.action }, class: 'btn btn-tool', data: { turbo: true, turbo_method: a.verb, turbo_frame: a.turbo_frame }) do
+      = yield cf_sym
    

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.33'.freeze
+  VERSION = '0.1.2.35'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.33
+  version: 0.1.2.35
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick