effective_datatables 4.7.6 → 4.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a83b549ce682f713931db6fb31f1432b9ccfca4d8e24ba43c56e0dcf8ff117f
-  data.tar.gz: 53709d9a9d9e7dd7bf8f6b8025088976090a8a3571f264e08e03da534b28119f
+  metadata.gz: ee156f06d9f35299e3e4cba5f45fa4525e2d74272d3e937061b13509b972d77e
+  data.tar.gz: 98ee4e7f35efd7fe6132ab3cbee74cff4f8bfc302a52c2b2b6494515839f215e
 SHA512:
-  metadata.gz: 0ebb22d41947d8e8fe4a8deebc9472f442617e4ace66e8cce6312e7f1e6de714e169b05a2146d823a568644b73a44871a82c7ab3faea72ca42fb1fb46d7c0ffb
-  data.tar.gz: ac2d99e28b03a04f60cd583c2a0c657380d505f53490be7a9a0e39d05d7005c6a0c2cb3f6e92723a5f126a22454834453a7581f0fbb124e9a4be56ed2436c038
+  metadata.gz: 5233cce6528fca4f2a67852861b60c3618c4ca02d6e3f4f7317360719642e242e1d4345b7cfa29aaeb46dcdc2a05c9d00d38b363c9c2b12bcbe0435d1dac3cf3
+  data.tar.gz: d24aae4ceab7c2f86200b9a160920cad475017bba99289139b4f6ffd230f1a3f3c0da988fafd74055179b2f6ee517bb978ae8aa7d963e152c08c1603dfdb6e47

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

@@ -164,28 +164,16 @@ module Effective
 
           search = opts[:search]
 
-          if search[:collection].kind_of?(ActiveRecord::Relation)
-            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
-          elsif search[:collection].kind_of?(Array) && search[:collection].first.kind_of?(ActiveRecord::Base)
-            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
-          elsif search[:collection].kind_of?(Array)
-            search[:collection].each { |obj| obj[1] = 'nil' if obj[1] == nil }
-          elsif search[:collection].kind_of?(Hash)
-            search[:collection].each { |k, v| search[:collection][k] = 'nil' if v == nil }
-          end
-
-          search[:value] ||= search.delete(:selected) if search.key?(:selected)
-
           search[:as] ||= :select if search.key?(:collection)
+          search[:fuzzy] ||= true unless search.key?(:fuzzy)
+          search[:value] ||= search.delete(:selected) if search.key?(:selected)
 
-          search[:fuzzy] = true unless search.key?(:fuzzy)
+          # Merge with defaults
+          search_resource = (opts[:resource] || effective_resource || fallback_effective_resource)
 
-          if search[:as] == :select && search.key?(:collection)
-            # No Action
-          elsif array_collection? && opts[:resource].present?
-            search.reverse_merge!(opts[:resource].search_form_field(name, collection.first[opts[:index]]))
+          if array_collection? && opts[:resource].present?
+            search.reverse_merge!(search_resource.search_form_field(name, collection.first[opts[:index]]))
           elsif search[:as] != :string
-            search_resource = (opts[:resource] || effective_resource || fallback_effective_resource)
             search.reverse_merge!(search_resource.search_form_field(name, opts[:as]))
           end
 

data/lib/effective_datatables/version.rb

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

metadata

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