effective_datatables 4.10.7 → 4.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca73f243bfad0546f2a52be13aeb213efe11b646a60a79522553bed168661a6
-  data.tar.gz: 56729e4ab420c501524f05e543bdf49ddd64af4b0d11c054dd283f29add4042d
+  metadata.gz: 1c5483c634b1459438b847c332144a23391c83f236f28c6cddad7c7a56314f51
+  data.tar.gz: f40f28f24b59f41e1fae0393c98def60fd6983c150925144006068dae66a1d9d
 SHA512:
-  metadata.gz: e894dd4994ed0803c0011e39e8d12cd38272205cfdcee296c52d631309fcf6a2444e6928fea0a227a453d28697b6744283d7db75771942447f687672a59ba64b
-  data.tar.gz: 205255688bb9334fb632bfdf1a52a81d8534463d82dc4ad62cec670f2ef91eba620ae63ba031cc1da6b1079a54cf64bacd19d4392ffafde24c11457dfbfd3bfb
+  metadata.gz: 3356da223d7b3060e4c5b4a0a3ccb3d2a0060d11687a710a85319e0996bb8e9b2ad96deb58a745495df55e713ec46e8643afb70c3e9d15ef466045f40bd5adfb
+  data.tar.gz: ffb6ba5ea8152d153a106f58463c426c11b1e13dfd6c98c853ac2fae8a98cd10e85dfe455bd52c1d435fc682b1ec316ecd121c551fdbdeafe07b5a14e05f8f5b

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_value_tool.rb

@@ -93,6 +93,7 @@ module Effective
       collection.select! do |row|
         obj = row[index]
         value = obj_to_value(row[index], column, row)
+        next if value.blank?
 
         case column[:as]
         when :boolean

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.7'.freeze
+  VERSION = '4.11.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.10.7
+  version: 4.11.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-06-27 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.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord