effective_datatables 4.10.4 → 4.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52636b5c1ed7d99254c4a3ffeac60a3e85edb190ca2321783f75ad6a5824298
-  data.tar.gz: 6c7681d656c2903bb55601b0168bf9973c17dee21f0118030dcb534e83d3ade7
+  metadata.gz: aca73f243bfad0546f2a52be13aeb213efe11b646a60a79522553bed168661a6
+  data.tar.gz: 56729e4ab420c501524f05e543bdf49ddd64af4b0d11c054dd283f29add4042d
 SHA512:
-  metadata.gz: 1e792d9737426b30211fd7e0810f8021d404149be1b47587c49799fa0090e41529a52a2736d07a7a8b593d8d325d325f00f2613372c40eb7cf08ee7759f553a7
-  data.tar.gz: 21da5721c55fe36fe9c232cc045e8b6f1ba72a13d7f275e03ed1dc8c7eac952f4d13cbcf9b4b081ddc05b70e508cc6ecf61d35259e17f1c65089d956b9457c52
+  metadata.gz: e894dd4994ed0803c0011e39e8d12cd38272205cfdcee296c52d631309fcf6a2444e6928fea0a227a453d28697b6744283d7db75771942447f687672a59ba64b
+  data.tar.gz: 205255688bb9334fb632bfdf1a52a81d8534463d82dc4ad62cec670f2ef91eba620ae63ba031cc1da6b1079a54cf64bacd19d4392ffafde24c11457dfbfd3bfb

data/app/helpers/effective_datatables_private_helper.rb

@@ -30,7 +30,7 @@ module EffectiveDatatablesPrivateHelper
   end
 
   def datatable_new_resource_button(datatable, name, column)
-    return unless column[:inline] && (column[:actions][:new] != false)
+    return unless datatable.inline? && (column[:actions][:new] != false)
 
     action = { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true }
 

data/app/models/effective/datatable_column_tool.rb

@@ -45,7 +45,7 @@ module Effective
       Rails.logger.info "COLUMN TOOL: order_column #{column.to_s} #{direction} #{sql_column}" if EffectiveDatatables.debug
 
       if column[:sql_as_column]
-        collection.order("#{sql_column} #{datatable.effective_resource.sql_direction(direction)}")
+        collection.order(Arel.sql("#{sql_column} #{datatable.effective_resource.sql_direction(direction)}"))
       else
         Effective::Resource.new(collection)
           .order(column[:name], direction, as: column[:as], sort: column[:sort], sql_column: column[:sql_column], limit: datatable.limit)

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/dsl/datatable.rb

@@ -90,7 +90,7 @@ module Effective
           )
         end
 
-        def actions_col(btn_class: nil, col_class: nil, inline: nil, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
+        def actions_col(btn_class: nil, col_class: nil, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
           raise 'You can only have one actions column' if datatable.columns[:_actions].present?
 
           datatable._columns[:_actions] = Effective::DatatableColumn.new(
@@ -102,7 +102,6 @@ module Effective
             csv: false,
             format: (format if block_given?),
             index: nil,
-            inline: (inline.nil? ? datatable.inline? : inline),
             label: false,
             name: :actions,
             partial: partial,

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
@@ -151,7 +155,7 @@ module Effective
       def actions_col_actions(column)
         resource_actions = (effective_resource&.resource_actions || fallback_effective_resource.fallback_resource_actions)
 
-        actions = if column[:inline]
+        actions = if inline?
           resource_actions.transform_values { |opts| opts['data-remote'] = true; opts }
         else
           resource_actions.transform_values { |opts| opts['data-remote'] = true if opts['data-method']; opts }

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.10.4'.freeze
+  VERSION = '4.10.7'.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.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord