effective_datatables 4.10.4 → 4.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52636b5c1ed7d99254c4a3ffeac60a3e85edb190ca2321783f75ad6a5824298
-  data.tar.gz: 6c7681d656c2903bb55601b0168bf9973c17dee21f0118030dcb534e83d3ade7
+  metadata.gz: ff2fc2d1c01b95734ac79fc727db5683a484399a5e68b370c1c80665310b2758
+  data.tar.gz: 4c1a8848ab3a22590c902388814ce9faec463adfa032e68d0144568282788d54
 SHA512:
-  metadata.gz: 1e792d9737426b30211fd7e0810f8021d404149be1b47587c49799fa0090e41529a52a2736d07a7a8b593d8d325d325f00f2613372c40eb7cf08ee7759f553a7
-  data.tar.gz: 21da5721c55fe36fe9c232cc045e8b6f1ba72a13d7f275e03ed1dc8c7eac952f4d13cbcf9b4b081ddc05b70e508cc6ecf61d35259e17f1c65089d956b9457c52
+  metadata.gz: 9001e7fe0a63a75445f35a9a36046a40a067f31c57e424ac0ac5c76a83662b762238e9a3e15b45b6ac893af369a97d2f3b3becaac01ff8b93fb3ccdeff94c29c
+  data.tar.gz: 8a4be22def5f90615598d06a0a89b578bb088be5b61beb2b65267466070b80fe3490e40821755158857357abf4faff15a45ea4957bda17ba5316489b10397eb1

data/app/models/effective/datatable_value_tool.rb

@@ -176,6 +176,8 @@ module Effective
 
       if column[:format]
         datatable.dsl_tool.instance_exec(obj, row, &column[:format])
+      elsif column[:as] == :belongs_to_polymorphic
+        obj.send(column[:name]).to_s
       elsif column[:partial]
         obj.to_s
       elsif obj.respond_to?(column[:name])

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

@@ -96,7 +96,11 @@ module Effective
         end
 
         if value.kind_of?(Array) && column[:as] == :string
-          return value.map { |v| view.content_tag(:div, format_column(v, column, csv: csv), class: 'col-resource_item') }.join.html_safe
+          if csv
+            return value.map { |v| format_column(v, column, csv: csv) }.join("\n")
+          else
+            return value.map { |v| view.content_tag(:div, format_column(v, column, csv: csv), class: 'col-resource_item') }.join.html_safe
+          end
         end
 
         case column[:as]
@@ -119,7 +123,7 @@ module Effective
         when :duration
           view.number_to_duration(value)
         when :effective_addresses
-          value.to_html
+          csv ? value.to_html.gsub('<br>', "\n") : value.to_html
         when :effective_obfuscation
           value
         when :effective_roles

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.10.4'.freeze
+  VERSION = '4.10.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.10.4
+  version: 4.10.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails