effective_datatables 4.11.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92dfaf548b47e5323f1e08f3ce7167a871c90e7d35deaa403491fba74bf827f2
-  data.tar.gz: 611e25b2241638476ef4f3d77a18921ef07e95c7a5fe262839292e789310039a
+  metadata.gz: 42b5024f89eb0023d4726035fd8312fae684f291cc108ca3adfb16bdf830aac5
+  data.tar.gz: 411a3ec031d8ec63b7f12fa71d71ba5aa50743b24c145d494d814e77081aea40
 SHA512:
-  metadata.gz: f86dd771a3e626feb40ab1766d13939ccb1dc2061b89f21ba87bd174e0ae5a5e31183d13591844434cf759e53378794e9414f2cdee6173e6357b95bb8ef6338b
-  data.tar.gz: a2978ce18ce4f9ef15bbf760591dc13dd2bf7db1acbc8a6d3a77b236b690efec4c7d0d741a73c833a90ea1655b8c8ba8e46e878ee7d93ef904e8f4debb7b665e
+  metadata.gz: 9b14bbea43b5c06f24cec46c1ffbee82dc86806deefc0bd81dc74f12dd73a850004b4dac59dac83fd24fe69a4cf75b281a2f498b4752035d4a13d2be2ef1c07c
+  data.tar.gz: 2cbf3ed396bb3be677531d02220de5fa1952ea01c481c7ffb426429de9ed0050a65923debfba606cbe0344f57ebe79fe33f1ef464b13959140dc2ce0c5bf020f

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

@@ -18,7 +18,7 @@ module Effective
       @view = datatable.view
     end
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args, **kwargs, &block)
       # Catch a common error
       if [:bulk_actions, :charts, :collection, :filters].include?(method) && in_datatables_do_block
         raise "#{method} block must be declared outside the datatable do ... end block"
@@ -26,15 +26,15 @@ module Effective
 
       if datatable.respond_to?(method)
         if block_given?
-          datatable.send(method, *args) { yield }
+          datatable.send(method, *args, **kwargs) { yield }
         else
-          datatable.send(method, *args)
+          datatable.send(method, *args, **kwargs)
         end
       elsif view.respond_to?(method)
         if block_given?
-          view.send(method, *args) { yield }
+          view.send(method, *args, **kwargs) { yield }
         else
-          view.send(method, *args)
+          view.send(method, *args, **kwargs)
         end
       else
         super

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/app/models/effective/effective_datatable/dsl/bulk_actions.rb

@@ -36,7 +36,7 @@ module Effective
 
           opts[:class] = [opts[:class], 'dropdown-item'].compact.join(' ')
 
-          link_to(title, url, opts)
+          link_to(title, url, **opts)
         end
 
       end

data/lib/effective_datatables/version.rb

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

metadata

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