effective_datatables 4.20.1 → 4.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb9f04b853ac311223db59175787b3b9671a5e5eb74c97a393f5d575ac72f714
-  data.tar.gz: 4db05c99cee7e59f7cd4e36018246a8a37348380317511414ee07fbf4ff0d690
+  metadata.gz: b290520f84f92726953ea0aef6cfa1e5c8d6acdafbc1701f6fb542357d077010
+  data.tar.gz: 9f7a715b57a9edf9dc31b806bdc85287e505a3e7766957599f555073ea43e71e
 SHA512:
-  metadata.gz: ebe4d62789555527455fcd14bb7a90b75dc66274ee7ee76fcec1522a34e97d1db22074ceaef131b27dbac62744a678fd870c0b6d845d3eb723ef03a71f1bfebf
-  data.tar.gz: 1f705f91ad14fe6735e60771d2ab64717622d36da4da0291ba43683612b458400f7572b474634452a33793a175ce2f3fc0d86a1b66a610c9278ce9cf0e75b600
+  metadata.gz: d8a92d42e7b7f79761f5ad4efec357071bf5f844797883139e248177a059f9b108d62080f7d45db5e3ffbbcbf7aee4383621462bcd6e14f75ffffcffcf0ff145
+  data.tar.gz: e2315412cb5e63b24d5d554dfddfa69e99895ba7c30ee015d829eadfd6908e36d976cb6cb5e4151afbc7adf75ce7b54653e43e8d5c7a109796cf51364912ae87

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

@@ -127,9 +127,12 @@ module Effective
             else
               if values.all? { |v| v.kind_of?(ActiveRecord::Base) && v.respond_to?(name) }
                 values = values.map { |v| (v[name] if opts[:sql_as_column]) || v.public_send(name) }
+                format_column(aggregate_column(values, opts, aggregate), opts)
+              elsif values.all? { |v| (v == true || v == false) }
+                aggregate_column(values, opts, aggregate)
+              else
+                format_column(aggregate_column(values, opts, aggregate), opts)
               end
-
-              format_column(aggregate_column(values, opts, aggregate), opts)
             end || BLANK
           end.compact
         end

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

@@ -142,20 +142,24 @@ module Effective
         when :time
           value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_time) : BLANK
         when :text
+          value_to_s = value.to_s
+
           if csv
-            value
-          elsif value.to_s.starts_with?('<') && value.to_s.ends_with?('>')
-            view.sanitize(value.to_s)
+            value_to_s
+          elsif value_to_s.include?('<') && value_to_s.include?('>')
+            view.sanitize(value_to_s)
           else
-            view.simple_format(value.to_s)
+            view.simple_format(value_to_s)
           end
         when :string
+          value_to_s = value.to_s
+
           if csv
-            value
-          elsif value.to_s.starts_with?('<') && value.to_s.ends_with?('>')
-            view.sanitize(value.to_s)
+            value_to_s
+          elsif value_to_s.include?('<') && value_to_s.include?('>')
+            view.sanitize(value_to_s)
           else
-            view.escape_once(value.to_s)
+            view.escape_once(value_to_s)
           end
         else
           value.to_s

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.20.1'.freeze
+  VERSION = '4.20.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.20.1
+  version: 4.20.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails