effective_datatables 4.10.2 → 4.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b43481421038a1511a8c6ccca052678aa5f70d8c70465e1e267d43fe4f05aa0f
-  data.tar.gz: d598bcb2c9633ab6dabaf7d2fe1cc7078dae9065613022437b200e43d06b1d1a
+  metadata.gz: ff2fc2d1c01b95734ac79fc727db5683a484399a5e68b370c1c80665310b2758
+  data.tar.gz: 4c1a8848ab3a22590c902388814ce9faec463adfa032e68d0144568282788d54
 SHA512:
-  metadata.gz: 5447d312f17607bb74eb955083085df297beeee2b92bb60ded0271f025a7095b5bae36a473ab79b456efc54cff8787bda574ca1b0c35276228155941023d7fe0
-  data.tar.gz: bd9c7bd9543d56529dc444b1f753087195a8ee6bc7631e07490a6b2d6115624b3c5f8fc2b7fe3dd832e627a7dd9e454be3a9471a0ebaf2cdd289f79abd149521
+  metadata.gz: 9001e7fe0a63a75445f35a9a36046a40a067f31c57e424ac0ac5c76a83662b762238e9a3e15b45b6ac893af369a97d2f3b3becaac01ff8b93fb3ccdeff94c29c
+  data.tar.gz: 8a4be22def5f90615598d06a0a89b578bb088be5b61beb2b65267466070b80fe3490e40821755158857357abf4faff15a45ea4957bda17ba5316489b10397eb1

data/app/helpers/effective_datatables_helper.rb

@@ -62,6 +62,7 @@ module EffectiveDatatablesHelper
         'inline' => inline.to_s,
         'language' => EffectiveDatatables.language(I18n.locale),
         'options' => input_js.to_json,
+        'reorder' => datatable.reorder?.to_s,
         'reorder-index' => (datatable.columns[:_reorder][:index] if datatable.reorder?).to_s,
         'simple' => simple.to_s,
         'spinner' => icon('spinner'), # effective_bootstrap

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

@@ -95,6 +95,14 @@ module Effective
           return value if value.kind_of?(String)
         end
 
+        if value.kind_of?(Array) && column[:as] == :string
+          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]
         when :actions
           raise("please use actions_col instead of col(#{name}, as: :actions)")
@@ -115,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.2'.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.2
+  version: 4.10.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails