effective_datatables 4.17.1 → 4.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be4e45193ceaf2f5fc2f8543cde183156ec0210d844a9603977f7b456197bf4
-  data.tar.gz: c7b437a89b3439f79b1d596936efb1be6401d8c12a4ffb844aecf2150d59772d
+  metadata.gz: 6f26ee8c45d6423c35786acd77acd78e6bd88bfe7e4be26b11aa6e7796cd9b3c
+  data.tar.gz: 8c573ae9e0cd5ba056ce26014e7a53344830af1e76070e7cd51b94d842d60671
 SHA512:
-  metadata.gz: d8601ecaaea61c41cdb6375e0f6b6521593326596c620142a7ea5752030dc3b9957453c1c1c3b82d6de54e21d8811fb6bad64cebef629cc6f6d064d86d8aec29
-  data.tar.gz: 0f55d6478da0bb096d493c898dc34a606b85f7b8b4009ff35bc5a58e5bc0a34c7828fe67b81fe4b4daa69f5b9f672d85e1d14787211bc6f4cf485e921d160884
+  metadata.gz: 0d6f374f11e08457c04f8aafe89c00765959d7482fc757afb06d4afbaf2d8528fcabf77299ed220b3f19f06c20b3a0cac2ec510ff531f3d1a20e95d82752e9d9
+  data.tar.gz: 41238dfc0d0a80fbd39ef9b52644b442a30a8136c1d8c626ac79f01259ce2fced941d4dace99a9d2a2248894cf3297747463d3f730b00ecb4384ad1010011ad6

data/app/models/effective/datatable_column_tool.rb

@@ -9,7 +9,7 @@ module Effective
       @datatable = datatable
 
       if datatable.active_record_collection?
-        @columns = datatable.columns.select { |_, col| col[:sql_column].present? }
+        @columns = datatable.columns.select { |_, col| col[:sql_column].present? || (col[:search_method].present? && col[:sql_column] != false) }
       else
         @columns = {}
       end

data/app/models/effective/datatable_value_tool.rb

@@ -12,7 +12,7 @@ module Effective
       if datatable.array_collection?
         @columns = datatable.columns
       else
-        @columns = datatable.columns.select { |_, col| col[:sql_column].blank? }
+        @columns = datatable.columns.reject { |_, col| col[:sql_column].present? || (col[:search_method].present? && col[:sql_column] != false) }
       end
     end
 

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.3'.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.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord