effective_datatables 4.10.6 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b4404aa7ed71091b5136e13f24348b67a2d591933b386a7f7a3d47c698cbd0
-  data.tar.gz: d0bfa93d8b63174ed043cd4cb4de596c49b51dccd75cb00d1e56a7d7753522a9
+  metadata.gz: 026730ba20562ddac0f28a5bde43b522207a59c4c9ae673545405b0c4d005a55
+  data.tar.gz: 72e5ef907b2c0b5fd94274a14f9025d34767abe5ad4aa56396d7888b7eb28b91
 SHA512:
-  metadata.gz: 645fd35fd30ad091d3a11e159b670a3def7e7f08d20af6646025f7d961214b8a995599dc824142378b4e97fe7c79eae02aed9db54e7d1081266c66c8350ea373
-  data.tar.gz: d4aa64b1d27c777537df67803031c194a764af723afa99fb34111f9f5f7bda9205530db9a4ca030dffaae99675fc653a116b6cbb937f1547f107f10676f976d3
+  metadata.gz: 7635a47dd2047b7dec807a11d881f6babc37603135c194a8303b1ae8307ec8628279b348543e806339548dd7e5f296fe784a3f82da8c2fd8ad0224b1e6f1d242
+  data.tar.gz: 5352f10cb81378464d412200784e255c197837fe67451182fe6b2e6d570673c627c3b2d0819e6831c3d7eb51290411339d8cd64f2cef9b66069407c375686847

data/app/assets/javascripts/effective_datatables/bulk_actions.js.coffee

@@ -19,11 +19,12 @@ $(document).on 'change', ".dataTables_wrapper input[data-role='bulk-actions']",
 
 toggleDropdown = ($wrapper) ->
   $bulkActions = $wrapper.children().first().find('.buttons-bulk-actions').children('button')
+  selected = $wrapper.find("input[data-role='bulk-action']:checked").length
 
-  if $wrapper.find("input[data-role='bulk-action']:checked").length > 0
-    $bulkActions.removeAttr('disabled')
+  if selected > 0
+    $bulkActions.removeAttr('disabled').text("Bulk Actions (#{selected} items)")
   else
-    $bulkActions.attr('disabled', 'disabled')
+    $bulkActions.attr('disabled', 'disabled').text('Bulk Actions')
 
 restoreSelected = ($table, selected) ->
   $bulkActions = $table.closest('.dataTables_wrapper').children().first().find('.buttons-bulk-actions').children('button')

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/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.6'.freeze
+  VERSION = '4.11.1'.freeze
 end

metadata

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