effective_datatables 4.17.1 → 4.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be4e45193ceaf2f5fc2f8543cde183156ec0210d844a9603977f7b456197bf4
-  data.tar.gz: c7b437a89b3439f79b1d596936efb1be6401d8c12a4ffb844aecf2150d59772d
+  metadata.gz: ad7b621e95979cb0e0e41548ef4993a0efd1ca7f1d262656c4a04e611f99fe3d
+  data.tar.gz: 657a4d88aab6e8eff27c86611bff1f35862b69fa30422fe2e29eb3ad0ecb7159
 SHA512:
-  metadata.gz: d8601ecaaea61c41cdb6375e0f6b6521593326596c620142a7ea5752030dc3b9957453c1c1c3b82d6de54e21d8811fb6bad64cebef629cc6f6d064d86d8aec29
-  data.tar.gz: 0f55d6478da0bb096d493c898dc34a606b85f7b8b4009ff35bc5a58e5bc0a34c7828fe67b81fe4b4daa69f5b9f672d85e1d14787211bc6f4cf485e921d160884
+  metadata.gz: 033e9e91e76c4682a5dd7bcc02cb68ae4e17558bfe22f665f476ed970b2c75790b9a87e3982b74a254777b9edc6fdfa80e51e88f082c770c76511cbbeecf7800
+  data.tar.gz: 5e3c4745edf257887fa236e0d974985a235599884ce912088140290afcdadcd13cd9ed9846d7bf2f758b4de0546b3d51c885b8aeeeeed90295de2f02ce7cfb3f

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

@@ -178,6 +178,8 @@ module Effective
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
           elsif search[:collection].kind_of?(Array) && search[:collection].first.kind_of?(ActiveRecord::Base)
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
+          elsif search[:collection].kind_of?(Array)
+            search[:collection] = search[:collection]
           end
 
           search[:as] ||= :select if search.key?(:collection)
@@ -189,6 +191,8 @@ module Effective
 
           if array_collection? && opts[:resource].present?
             search.reverse_merge!(search_resource.search_form_field(name, collection.first[opts[:index]]))
+          elsif search[:as] == :select && search[:collection].kind_of?(Array)
+            # Nothing to do
           elsif search[:as] != :string
             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.17.1'.freeze
+  VERSION = '4.17.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.17.1
+  version: 4.17.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails