effective_resources 2.7.2 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7672ef626e66ae80fbb5b19feda283a58aab1d739f3dc753c012fffe6892d113
-  data.tar.gz: 0b5e7f03c53fbd78bff223c787753b3d391ff202f103d7cf3f063efb31fef5cb
+  metadata.gz: ddbc305a4fe6da53cc0d4a6bdb95a6bcde56fd64f9c2ce714bec57e850eb4936
+  data.tar.gz: cdc5008daa38b79bfb3a7e3f64e13c81123b6587c62ca4f803144ea07438eb92
 SHA512:
-  metadata.gz: dc20991a7fd54070688e1ef3d9a3e1d818088ef714ce3da408e2b1ba6269f173944314c49a94236c9c9755f563476bb720979c857ff3e1744764b0f5d1eb13d1
-  data.tar.gz: 686c3ce4f47647496bf7e411d6cc6313c018ed8d84aab9abcf1488a96fb88a9f150b105ab26a2f0a371d236f07447258a92cc385601cce3c8ade89a2b649d784
+  metadata.gz: '0498afe80ac145df61098606e5b245e5b33ac901a70774d6a51601bfc1cfc1ec9c359c4e0805d6d8c7c5e7fa1b4d8b89904e99137764f0503f4b899b85f78065'
+  data.tar.gz: e8361d0eed8f876bda4565c4d0c250607e447e59f6f7ce196283c44148adcfa863492aac59b92fc8b0b13cdeb521edc2a88f60417ca981b4eaf47ca0b0350221

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,14 @@ module ActsAsWizard
       self.class.const_get(:WIZARD_STEPS).keys
     end
 
+    def all_steps
+      wizard_step_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 +93,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.4'.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.4
 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