effective_datatables 4.10.5 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2fc2d1c01b95734ac79fc727db5683a484399a5e68b370c1c80665310b2758
-  data.tar.gz: 4c1a8848ab3a22590c902388814ce9faec463adfa032e68d0144568282788d54
+  metadata.gz: 92dfaf548b47e5323f1e08f3ce7167a871c90e7d35deaa403491fba74bf827f2
+  data.tar.gz: 611e25b2241638476ef4f3d77a18921ef07e95c7a5fe262839292e789310039a
 SHA512:
-  metadata.gz: 9001e7fe0a63a75445f35a9a36046a40a067f31c57e424ac0ac5c76a83662b762238e9a3e15b45b6ac893af369a97d2f3b3becaac01ff8b93fb3ccdeff94c29c
-  data.tar.gz: 8a4be22def5f90615598d06a0a89b578bb088be5b61beb2b65267466070b80fe3490e40821755158857357abf4faff15a45ea4957bda17ba5316489b10397eb1
+  metadata.gz: f86dd771a3e626feb40ab1766d13939ccb1dc2061b89f21ba87bd174e0ae5a5e31183d13591844434cf759e53378794e9414f2cdee6173e6357b95bb8ef6338b
+  data.tar.gz: a2978ce18ce4f9ef15bbf760591dc13dd2bf7db1acbc8a6d3a77b236b690efec4c7d0d741a73c833a90ea1655b8c8ba8e46e878ee7d93ef904e8f4debb7b665e

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/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

@@ -155,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/engine.rb

@@ -6,11 +6,13 @@ module EffectiveDatatables
 
     # Include Helpers to base application
     initializer 'effective_datatables.action_controller' do |app|
-      ActiveSupport.on_load :action_controller_base do
-        helper EffectiveDatatablesHelper
-        helper EffectiveDatatablesPrivateHelper
+      app.config.to_prepare do
+        ActiveSupport.on_load :action_controller_base do
+          helper EffectiveDatatablesHelper
+          helper EffectiveDatatablesPrivateHelper
 
-        ActionController::Base.send :include, ::EffectiveDatatablesControllerHelper
+          ActionController::Base.send :include, ::EffectiveDatatablesControllerHelper
+        end
       end
     end
 

data/lib/effective_datatables/version.rb

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

metadata

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