effective_resources 2.36.3 → 2.36.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193c421cf2d3da6dd5e07185f71e7b1a37d3fcf9856f0aff4b5db47e69765dc0
-  data.tar.gz: 3aa8cfeac216a782bee96aaf8058143051ecef58e619845da8e04c6779fdee28
+  metadata.gz: '086e9b2c0d5f9e843a39a880c48ca7467c454d96d426b7a789f474ed6db2d37f'
+  data.tar.gz: 7ad84343ab0180ecb8b2c73a767af2904f23b27f4d497fe3f45f729abed23337
 SHA512:
-  metadata.gz: 943707c27e2717e7770b37a3ca6fbf33d99c2de91f73b949dac35539d21b677d82fe2944f8f0200a407501d29efe4da783f15a30dee4804e7a7839fb9f489770
-  data.tar.gz: ff13a0c8e401cdf4b9d50b5f316298e784274bfb91c134508d03afe701d812bcecdd3f75bcfeca78bc482c4efd029b8ef0ae351a91314c871519bfb55c8300cf
+  metadata.gz: cf277644616c40600656c124b3982f5a39e27a87805b2b38d11adde65ae58672d974488d7745ee141724cf05a8a9a2dac9b37d8a42e1cfd05177a358e4be63dc
+  data.tar.gz: 0c70a0926f46a18b73edb4a045bd7b1764dccab54e610aa4e389ea129024c7b1e9f48e1c9f2b660d2087e4ea18b45dffbdbbc2f90764176141032058bf329e12

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

@@ -18,6 +18,17 @@ module Effective
         effective_resource.url_helpers.url_for(merged_url_options)
       end
 
+      # Override from wicked to support a fallback wizard step template
+      def render_step(the_step, options = {}, params = {})
+        if the_step.nil? || the_step.to_s == Wicked::FINISH_STEP
+          redirect_to_finish_wizard(options, params)
+        elsif lookup_context.exists?(the_step.to_s, lookup_context.prefixes)
+          render(the_step, options)
+        else
+          render('effective/acts_as_wizard/wizard_step', options)
+        end
+      end
+
     end
   end
 end

data/app/models/concerns/acts_as_wizard.rb

@@ -219,6 +219,13 @@ module ActsAsWizard
       end
     end
 
+    def render_partial_path
+      raise("expected render_path to be set") unless render_path.present?
+      raise("expected render_step to be set") unless render_step.present?
+
+      "#{render_path}/#{render_step}"
+    end
+
     private
 
     def can_revisit_completed_steps(step)

data/app/views/effective/acts_as_wizard/_wizard_step.html.haml

@@ -1,11 +1,3 @@
 = wizard_card(resource) do
   - partial = "#{resource.render_path}/#{resource.render_step}_fields"
-
-  - if render_partial_exists?(partial)
-    = effective_table_with(resource) { |f| render(partial, f: f) }
-
-  - elsif Rails.env.development? || Rails.env.test?
-    - names = partial.split('/')
-    - name = names[0...-1].join('/') + '/_' + names.last + '.html.haml'
-
-    %div.alert.alert-warning Unable to find partial: #{name}
+  = effective_table_with(resource) { |f| render(partial, f: f) }

data/app/views/effective/acts_as_wizard/wizard_step.html.haml

@@ -0,0 +1,15 @@
+- prefix = controller_path
+- locals = { resource: resource, Effective::Resource.new(resource).name.to_sym => resource }
+
+= render "#{prefix}/layout" do
+  = render_if_exists("#{prefix}/content", locals)
+
+  = card do
+    = render_if_exists("#{prefix}/#{step}_requirements", locals)
+
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = render("#{prefix}/#{step}_fields", f: f)
+
+      = f.submit 'Save and Continue', left: true

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.36.3'.freeze
+  VERSION = '2.36.5'.freeze
 end

data/lib/effective_resources.rb

@@ -213,7 +213,7 @@ module EffectiveResources
       resource.datatable_name
     elsif resource.respond_to?(:model_name) == false # Just a string. Fees will do this
       value = I18n.t(resource)
-      raise StandardError.new("Missing translation: #{resource}") if value.include?("Missing translation:")
+      raise StandardError.new("Missing translation: #{resource}") if value.include?(resource) || value.include?("Missing translation:")
       value
     elsif attribute.blank?
       resource.model_name.human

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.36.3
+  version: 2.36.5
 platform: ruby
 authors:
 - Code and Effect
@@ -266,6 +266,7 @@ files:
 - app/views/effective/acts_as_published/_fields.html.haml
 - app/views/effective/acts_as_slugged/_fields.html.haml
 - app/views/effective/acts_as_wizard/_wizard_step.html.haml
+- app/views/effective/acts_as_wizard/wizard_step.html.haml
 - app/views/effective/resource/_actions.html.haml
 - app/views/effective/resource/_actions_dropleft.html.haml
 - app/views/effective/resource/_actions_glyphicons.html.haml