effective_resources 1.8.15 → 1.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4b28e1caca0bb8019717713f5c76ae4c1b9e8008936450697ff53f9bca96546
-  data.tar.gz: '09187e5fcec31ad99827706d91a900038097c84579ee701fbafe6efde2dbed7d'
+  metadata.gz: a854fdf544ea77faf7d45b251f8161b54ef66685c71730d6b4bdef42298ac371
+  data.tar.gz: 22d0141d18a049ed853d2ba54197758e46817ffdf6704c1facee7850cad5bef6
 SHA512:
-  metadata.gz: af2652031c87d654fd8ba0210a41893a5eae2fa1a85ff05667b78b36cf0cf51fe01185f6c5d4d6d4ebb36eb8217ec73170a3f24680f19fba6b330b04ee1cf439
-  data.tar.gz: 651d54db0baf6fd4c6817b1669e9facaecd43b1792fe6a48b96ce9a72ce65f6c430b77665152574e95ebaf786886b78d63374e9cade0113794d0c78b9d824127
+  metadata.gz: fa64174fb405b2499a303ed87d64b8e32aa4d7c48388875c811919526935679a4c98bfef973e0f41b2124257b5d9d46207e906f85776d5eb5c0bf487ee086179
+  data.tar.gz: e00c2e31e5430de0a3e19d2f0d607fa73426edbbe8f7d31c0936f60a418a4bf92206fef2d904d2ba78dab1bfffc132235056ad138ede924642cabdeffd8a6408

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

@@ -46,9 +46,9 @@ module Effective
       end
     end
 
-    def resource_wizard_step_title(step)
+    def resource_wizard_step_title(resource, step)
       return if step == 'wicked_finish'
-      effective_resource.klass.const_get(:WIZARD_STEPS).fetch(step)
+      resource.wizard_step_title(step)
     end
 
     def resource_wizard_steps

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

@@ -8,7 +8,7 @@ module Effective
         self.resource ||= resource_scope.new
         EffectiveResources.authorize!(self, :new, resource)
 
-        redirect_to resource_wizard_path(:new, resource_wizard_steps.first)
+        redirect_to resource_wizard_path(:new, resource.first_uncompleted_step || resource_wizard_steps.first)
       end
 
       def show

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

@@ -49,7 +49,7 @@ module Effective
           Rails.logger.info "  Unable to visit step :#{step}. Last can_visit_step? is :#{next_step}. Change the acts_as_wizard model's can_visit_step?(step) function to change this."
         end
 
-        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(next_step)} step."
+        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(resource, next_step)} step."
         redirect_to wizard_path(next_step)
       end
 
@@ -66,7 +66,7 @@ module Effective
       # before_action :assign_page_title, only: [:show, :update]
       # Assign page title
       def assign_page_title
-        @page_title ||= resource_wizard_step_title(step)
+        @page_title ||= resource_wizard_step_title(resource, step)
       end
 
     end

data/app/helpers/effective_resources_wizard_helper.rb

@@ -20,7 +20,7 @@ module EffectiveResourcesWizardHelper
   def render_wizard_sidebar_item(resource, nav_step, index = nil)
     # From Controller
     current = (nav_step == step)
-    title = resource_wizard_step_title(nav_step)
+    title = resource_wizard_step_title(resource, nav_step)
 
     # From Model
     disabled = !resource.can_visit_step?(nav_step)

data/app/models/concerns/acts_as_wizard.rb

@@ -43,6 +43,7 @@ module ActsAsWizard
       wizard_steps[current_step.to_sym] ||= Time.zone.now
     end
 
+    # Use can_visit_step? required_steps and wizard_step_title(step) to control the wizard behaviour
     def can_visit_step?(step)
       can_revisit_completed_steps(step)
     end
@@ -52,6 +53,10 @@ module ActsAsWizard
       self.class.const_get(:WIZARD_STEPS).keys
     end
 
+    def wizard_step_title(step)
+      self.class.const_get(:WIZARD_STEPS).fetch(step)
+    end
+
     def first_completed_step
       required_steps.find { |step| has_completed_step?(step) }
     end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.15'.freeze
+  VERSION = '1.8.16'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.15
+  version: 1.8.16
 platform: ruby
 authors:
 - Code and Effect