effective_datatables 4.7.7 → 4.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee156f06d9f35299e3e4cba5f45fa4525e2d74272d3e937061b13509b972d77e
-  data.tar.gz: 98ee4e7f35efd7fe6132ab3cbee74cff4f8bfc302a52c2b2b6494515839f215e
+  metadata.gz: e1ffaca2f3188d2d0e191f663bda92dc3abf1689dc10d75a86e6685429b10ee6
+  data.tar.gz: d72d0f4a1f13b1bd53e5976a127dfc141e3b06d1044c0968569297d7fce47a45
 SHA512:
-  metadata.gz: 5233cce6528fca4f2a67852861b60c3618c4ca02d6e3f4f7317360719642e242e1d4345b7cfa29aaeb46dcdc2a05c9d00d38b363c9c2b12bcbe0435d1dac3cf3
-  data.tar.gz: d24aae4ceab7c2f86200b9a160920cad475017bba99289139b4f6ffd230f1a3f3c0da988fafd74055179b2f6ee517bb978ae8aa7d963e152c08c1603dfdb6e47
+  metadata.gz: 6636d69ef21c9043e53223fc978426652c1f026fb1ba68785db8abf26d6646f1d1fdffd4d5a97845f11b91a77661f781891367f232f60b7a9453a60482887a9f
+  data.tar.gz: 1bdd69edde3a0123cefae1d370f04572e7cd509fee702d6f449d2188cad41f04bcf7e3b714452d75a543b26ba89603ef6850b66800266d64f6b5ddaa05443448

data/app/models/effective/effective_datatable/resource.rb

@@ -169,7 +169,8 @@ module Effective
           search[:value] ||= search.delete(:selected) if search.key?(:selected)
 
           # Merge with defaults
-          search_resource = (opts[:resource] || effective_resource || fallback_effective_resource)
+          search_resource = [opts[:resource], effective_resource, fallback_effective_resource].compact
+          search_resource = search_resource.find { |res| res.klass.present? } || search_resource.first
 
           if array_collection? && opts[:resource].present?
             search.reverse_merge!(search_resource.search_form_field(name, collection.first[opts[:index]]))

data/app/views/effective/datatables/_resource_column.html.haml

@@ -8,4 +8,4 @@
       - elsif show_action && EffectiveDatatables.authorized?(controller, :show, resource) && (path = effective_resource.action_path(:show, resource)).present?
         = link_to resource_to_s, path, title: resource_to_s
       - else
-        = resource_to_s.html_safe
+        = resource_to_s.to_s.html_safe

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.7'.freeze
+  VERSION = '4.7.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.7.7
+  version: 4.7.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails