effective_resources 2.7.13 → 2.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bb2a084588e63b0a14f3dedd0005ce818d7a4a7b3019b63d814a91eb1327ea6
-  data.tar.gz: 69f961a1fd267683a614d20c3c1eb2a2b8e6df1d33870bfbe69e8dd4bf5d536b
+  metadata.gz: d09c8f004df1def2c6a2cebc8fd78ce3335138ccd5934b7803cc740663b94a84
+  data.tar.gz: 45e2a292a727c4a810b959cc0880dff2d0a2ce150ae7afba7fcfed5715322c65
 SHA512:
-  metadata.gz: 91fd5726c377ca31a3f93138ea49bf6f84a72224ef01b26dcbf0debf88295e7847769a7cc3e38be54403cba076cb0c8c55154f68305e1e228ea535d475de51e5
-  data.tar.gz: cefcb433e0bbed95da84d1444e0853bffc8171113a4a9439cd4bbb2e843d2ec91e1175604dce95d2962e4f3af7505991fa0be3fa0c45e98b31c0f06e3e787bdb
+  metadata.gz: a1e4d8ce6a7651ef6a75eb3d9e5db2f46b38bd2d6d399b26ad32d5c9cb1b38751cf2e0df139d916afdc0bf067ed07c67f8d3b3c7211faa6a7e82cb2189a8d7b7
+  data.tar.gz: 3de7ab00c232373fc66c4254cdc49457b84c4bb32e53951ed50e94adab89f3819c8e659fd37ce88c8707b6f609877474d7c7da26cb70c8762b6ebe16c61c5abc

data/app/models/effective/resources/forms.rb

@@ -75,7 +75,14 @@ module Effective
           if res.klass.unscoped.respond_to?(:datatables_scope)
             { collection: res.klass.datatables_scope.map { |obj| [obj.to_s, obj.id] } }
           elsif res.klass.unscoped.respond_to?(:datatables_filter)
-            { collection: res.klass.datatables_filter.map { |obj| [obj.to_s, obj.id] } }
+            collection = res.klass.datatables_filter
+
+            if collection.kind_of?(Array)
+              { collection: collection }
+            else
+              { collection: collection.map { |obj| [obj.to_s, obj.id] } }
+            end
+
           elsif res.klass.unscoped.respond_to?(:sorted)
             { collection: res.klass.sorted.map { |obj| [obj.to_s, obj.id] } }
           else

data/app/models/effective/resources/relation.rb

@@ -391,6 +391,8 @@ module Effective
       def search_columns_by_ilike_term(collection, value, columns:, fuzzy: nil)
         return collection if value.blank?
 
+        value = value.to_s
+
         raise('unsupported OR and AND syntax') if value.include?(' OR ') && value.include?(' AND ')
         raise('expected columns') unless columns.present?
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.13'.freeze
+  VERSION = '2.7.15'.freeze
 end

metadata

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