effective_resources 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7672ef626e66ae80fbb5b19feda283a58aab1d739f3dc753c012fffe6892d113
-  data.tar.gz: 0b5e7f03c53fbd78bff223c787753b3d391ff202f103d7cf3f063efb31fef5cb
+  metadata.gz: 5e36a25d824db2b9794dd755ee4311385e59e0061448ce72f6e018c37ae2dc09
+  data.tar.gz: a9ac9af3756f705d50a545810e22e5179f2febdd9754fbbdf2e0b825e12bc149
 SHA512:
-  metadata.gz: dc20991a7fd54070688e1ef3d9a3e1d818088ef714ce3da408e2b1ba6269f173944314c49a94236c9c9755f563476bb720979c857ff3e1744764b0f5d1eb13d1
-  data.tar.gz: 686c3ce4f47647496bf7e411d6cc6313c018ed8d84aab9abcf1488a96fb88a9f150b105ab26a2f0a371d236f07447258a92cc385601cce3c8ade89a2b649d784
+  metadata.gz: 6acf08c36bf3ce4c15c225a1605594d1d2e6b19c20c3cb199bb13e9f312ce8a0edaff5c8665811c71491802c5a53cee2f6dab383e92de4485a8217c9eb4f9004
+  data.tar.gz: b94c04b3a8e3512af8f3f554091b604f2317511e9575900d3c8fc541a56b16729f620e02a5ad60b8b3b598a1bee4cdd9a2fb94d7597e4330af87ec10503b4dc4

data/app/controllers/concerns/effective/crud_controller.rb

@@ -74,16 +74,16 @@ module Effective
       super
     end
 
+    def resource_klass # Thing
+      effective_resource.klass
+    end
+
     private
 
     def resource_scope
       effective_resource.relation
     end
 
-    def resource_klass # Thing
-      effective_resource.klass
-    end
-
     def resource_name # 'thing'
       effective_resource.name
     end

data/app/helpers/effective_resources_helper.rb

@@ -274,7 +274,7 @@ module EffectiveResourcesHelper
     title = resource.wizard_step_title(step)
     raise("expected a title for step #{step}") unless title.present?
 
-    link = if edit_effective_wizard? && resource.can_visit_step?(step)
+    link = if edit_effective_wizard? && resource.is_a?(controller.resource_klass) && resource.can_visit_step?(step)
       link_to('Edit', wizard_path(step), title: "Edit #{title}")
     end
 

data/app/models/concerns/acts_as_wizard.rb

@@ -57,6 +57,10 @@ module ActsAsWizard
       self.class.const_get(:WIZARD_STEPS).keys
     end
 
+    def completed_steps
+      wizard_steps.keys
+    end
+
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
 
@@ -85,7 +89,7 @@ module ActsAsWizard
     # For use in the summary partials. Does not include summary.
     def render_steps
       blacklist = [:start, :billing, :checkout, :submitted, :summary]
-      (required_steps - blacklist).select { |step| has_completed_step?(step) }
+      (required_steps + completed_steps - blacklist).select { |step| has_completed_step?(step) }
     end
 
     def wizard_step_title(step)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.2'.freeze
+  VERSION = '2.7.3'.freeze
 end

metadata

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