effective_resources 2.9.4 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5238f51cc7e5066cef998e991f9905f4492419900004d5fdb488b782e475555
-  data.tar.gz: 8673f4e1f7b1dfafdb482d5dbe76226da53911ee05b5117187e0affabdb81d69
+  metadata.gz: 39e741d139479e1a017d296ec0969dfdfb3538306eaed9c68bf6d1cd0989ea0a
+  data.tar.gz: ba6488be9829f625c38cef081721a1c2c446fc3bbe1f99afdcf95624e0364dc5
 SHA512:
-  metadata.gz: dcb765e5931c64b5e56553046c498f21ff1e0dc54dffbd2d20df9107780401bdb31e50eedad950f09e21f6866a9383d038defb60babc51c378aede5a2aee166f
-  data.tar.gz: de2b98efbba78404c14da1b7140723264e948cd2b601ff89ddaa8746da7ea247808a272e3f41deadcc4d81401c91c1719e4287b6096b0e32e87522684936a055
+  metadata.gz: 7cee67d34504f2ccfb3e211336b04c22247245f03893cf0f5ec832c87ee3c1d2d6fc0cb3628b5bc5f889245d81a872904d7cadc7c7116fd0aab787ba3e270885
+  data.tar.gz: '03317804a2b7867a4ae53016b82ff68a406e17333bccb413a9cb935d2c990ed242f6c64d1afd5bf74caf452c2e3dcc1545189f9dfeb0d8bad1be52134009ccf4'

data/app/controllers/concerns/effective/wizard_controller/before_actions.rb

@@ -45,9 +45,11 @@ module Effective
         return if step == 'wicked_finish'
         return if resource.blank?
         return if resource.try(:done?)
-        return unless resource_scope.respond_to?(:in_progress)
+        return unless resource_scope.respond_to?(:in_progress_for) || resource_scope.respond_to?(:in_progress)
+
+        in_progress = resource_scope.try(:in_progress_for, current_user) || resource_scope.try(:in_progress)
+        existing = in_progress.order(:id).where.not(id: resource).first
 
-        existing = resource_scope.in_progress.order(:id).where.not(id: resource).first
         return unless existing.present?
         return if resource.persisted? && (existing.id > resource.id) # Otherwise we get an infinite loop
 

data/app/models/concerns/acts_as_wizard.rb

@@ -21,6 +21,18 @@ module ActsAsWizard
     end
   end
 
+  module ClassMethods
+    def acts_as_wizard?; true; end
+
+    def wizard_steps_hash
+      const_get(:WIZARD_STEPS)
+    end
+
+    def all_wizard_steps
+      const_get(:WIZARD_STEPS).keys
+    end
+  end
+
   included do
     acts_as_wizard_options = @acts_as_wizard_options
 
@@ -180,17 +192,6 @@ module ActsAsWizard
 
   end
 
-  module ClassMethods
-    def acts_as_wizard?; true; end
-
-    def wizard_steps_hash
-      const_get(:WIZARD_STEPS)
-    end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
-  end
 
 end

data/app/views/application/member_action.js.erb

@@ -4,7 +4,7 @@
 <% if local_assigns[:html_template].present? %>
   EffectiveForm.remote_form_payload = "<%= j(render_resource_partial(@resource, action: action)) %>";
 <% else %>
-  EffectiveForm.remote_form_payload = "<%= j(render_resource_form(@resource, action: action, safe: true).presence || render_resource_partial(@resource)) %>";
+  EffectiveForm.remote_form_payload = "<%= j(render_resource_form(@resource, action: action, safe: true).presence || render_resource_partial(@resource, safe: true)) %>";
 <% end %>
 
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.9.4'.freeze
+  VERSION = '2.9.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails