effective_datatables 4.17.2 → 4.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7b621e95979cb0e0e41548ef4993a0efd1ca7f1d262656c4a04e611f99fe3d
-  data.tar.gz: 657a4d88aab6e8eff27c86611bff1f35862b69fa30422fe2e29eb3ad0ecb7159
+  metadata.gz: '06189b222bdbaf62e5b823c4f2a86fad63f0864590edde7dad41e1d8c72b7eac'
+  data.tar.gz: 352172976389234dd13d08e6822ef18438683e08dbda77f0f30f57288c173090
 SHA512:
-  metadata.gz: 033e9e91e76c4682a5dd7bcc02cb68ae4e17558bfe22f665f476ed970b2c75790b9a87e3982b74a254777b9edc6fdfa80e51e88f082c770c76511cbbeecf7800
-  data.tar.gz: 5e3c4745edf257887fa236e0d974985a235599884ce912088140290afcdadcd13cd9ed9846d7bf2f758b4de0546b3d51c885b8aeeeeed90295de2f02ce7cfb3f
+  metadata.gz: 953eb5f1cba86efab0fdcd8ba34de7253a8095dd9481e694eee5399931020b9d026a45066bd9497d07f665db48ae95df67e6859184af557d8fdc4341bd3ca27a
+  data.tar.gz: bf80a017f52a9073f755256bfaf88ba80ce8907a71377625021e16400d2cac1ff3cc1bdc85007ca7678e039506a5b59c168b36df6d377487bd89c61e132e6fd8

data/app/models/effective/datatable.rb

@@ -61,8 +61,14 @@ module Effective
 
     # Checks en.datatables.admin/my_datatable
     def self.datatable_name
-      value = I18n.t("datatables.#{name.underscore}").to_s
-      value.start_with?('translation missing:') ? name.titleize.split('/').last.chomp(' Datatable') : value
+      key = "datatables.#{name.underscore}"
+      value = ::I18n.t(key)
+
+      if value.include?(key) # missing translation
+        name.titleize.split('/').last.chomp(' Datatable')
+      else
+        value
+      end
     end
 
     def datatable_name

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/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.17.2'.freeze
+  VERSION = '4.17.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.17.2
+  version: 4.17.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-08-03 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