effective_resources 1.4.11 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32323055f3cf20452972cf11e64f696a64eb240bee54990e71a41a0179db8ce8
-  data.tar.gz: 0f3612b1b220e6011c2d7094be638886a6689ab8273555cefc94552afb285361
+  metadata.gz: 257e008e3128f7406e1326a914150fff64ef02bd5fd066eaa5f0eae4dda85504
+  data.tar.gz: 395118768affb307c80e80ee94b2a07396400697986b4a4a9e582336460b9057
 SHA512:
-  metadata.gz: a8b4bfa9a2a682de256222b9e2961be1ba178f44731acba3860e41cd7a030dea93bcc920b863351335f35f05ab473ef613982c4182319e42b73fe9b699e43854
-  data.tar.gz: 939a5f4e51b5865c4d70c0627edd747c0d2c7c5477d97b9b75ee05e60b3a0a3b304c6890892898302e70d96e860a4e986e3ebe53ff60f8817c3a68a4d5fee88c
+  metadata.gz: 9bdd4a65ca14b8c0e92f312d6d4ad7e49f1fd4966608dd01afb49a637b2f075e6ff92d740148c609ae6239709f786bf5d75fffd7a6292aef5ea60388fcd3c035
+  data.tar.gz: 8e2099089a87a6833f0e1041f85ea8b91954de940ce63433197f8372cf18901d2e8ee6a384529acca2568d5c99b9a2bf7b50713c573e219477055c2707e46153

data/app/helpers/effective_resources_helper.rb

@@ -146,6 +146,30 @@ module EffectiveResourcesHelper
     end
   end
 
+  # Similar to render_resource_form
+  def render_resource_partial(resource, atts = {})
+    unless resource.kind_of?(ActiveRecord::Base) || resource.class.ancestors.include?(ActiveModel::Model)
+      raise 'expected first argument to be an ActiveRecord or ActiveModel object'
+    end
+
+    raise 'expected attributes to be a Hash' unless atts.kind_of?(Hash)
+
+    effective_resource = (atts.delete(:effective_resource) || find_effective_resource)
+
+    action = atts.delete(:action)
+    atts = { :namespace => (effective_resource.namespace.to_sym if effective_resource.namespace), effective_resource.name.to_sym => resource }.compact.merge(atts)
+
+    if lookup_context.template_exists?(effective_resource.name, controller._prefixes, :partial)
+      render(effective_resource.name, atts)
+    elsif lookup_context.template_exists?(effective_resource.name, [effective_resource.plural_name], :partial)
+      render(effective_resource.plural_name + '/' + effective_resource.name, atts)
+    elsif lookup_context.template_exists?(effective_resource.name, [effective_resource.name], :partial)
+      render(effective_resource.name + '/' + effective_resource.name, atts)
+    else
+      render(resource, atts)  # Will raise the regular error
+    end
+  end
+
   # Tableize attributes
   # This is used by effective_orders, effective_logging, effective_trash and effective_mergery
   def tableize_hash(obj, table: 'table', th: true, sub_table: 'table', sub_th: true, flatten: true)

data/app/views/application/show.html.haml

@@ -8,7 +8,7 @@
     .col-4.text-right
       = render_resource_buttons(@resource, show: false)
 
-  = render @resource
+  = render_resource_partial(@resource)
 
 .form-actions
   = link_to 'Continue', (resource.action_path(:index) || root_path), class: 'btn btn-primary'

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

@@ -1,6 +1,6 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = "<%= j render(@resource) %>";
+EffectiveForm.remote_form_payload = "<%= j render_resource_partial(@resource) %>";
 EffectiveForm.remote_form_commit = "<%= params[:commit] %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.4.11'.freeze
+  VERSION = '1.4.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.4.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails