effective_datatables 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a53e65ef62ff9d0a782a0080f6a9deadd22b609
-  data.tar.gz: ac4e5578e12e9bef11b5093bff3fee1c7443a67d
+  metadata.gz: 31a344040059c64f97f81b5e6bab69a4e847ceb5
+  data.tar.gz: fc9adcb63f54ff31c7ed5f43f742f789bd7758f6
 SHA512:
-  metadata.gz: 039ca9d10af887b4949882b743cfc60f76e4247374595f80400c2b43850892be2149d51b0fc66e357029006100d8f9734e347840bd61d76c3eaaa142092e56cf
-  data.tar.gz: f7f922a6ec951c3f20b83c1b478f5cc580136c35dfc9d9c8a06fb4dd4947a2f7f25da6525c6fd87e2ff673bb649f3f125a594798daa8231e1348042cb4d25a0f
+  metadata.gz: 6c650bb8a060b85d5bc82fb03ba6da4bb9a11749f5065b5e990fc5480cbe27eed332f25ee6aa913caedfcd4167521d0009927d99f29a4b7dd6af1654b8eb2826
+  data.tar.gz: f5ef7aa35f0574428a6ddb7acf50c58e2b9ad471080c605e0ffb3d8895097cef601dc2216ada0dde25825c330dd06fd90ff620b4c6f6413ca152f6d8ff88d6ea

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

@@ -53,7 +53,7 @@ $(document).on 'click', '.dataTables_wrapper .buttons-bulk-actions a', (event) -
 
   url = $bulkAction.attr('href')
   title = $bulkAction.text()
-  downloadToken = $bulkAction.parent('li').data('authenticity-token')
+  download = $bulkAction.data('bulk-download')
   token = $table.data('authenticity-token')
   values = $.map($selected, (input) -> input.getAttribute('value'))
   method = $bulkAction.data('ajax-method')
@@ -73,10 +73,10 @@ $(document).on 'click', '.dataTables_wrapper .buttons-bulk-actions a', (event) -
 
   $table.dataTable().data('bulk-actions-restore-selected-values', values)
 
-  if downloadToken # This is a file download
+  if download # This is a file download
     $.fileDownload(url,
       httpMethod: 'POST',
-      data: { ids: values, authenticity_token: downloadToken }
+      data: { ids: values, authenticity_token: token }
       successCallback: ->
         success = "Successfully completed #{title} bulk action"
         $table.one 'draw.dt', (e) -> $(e.target).DataTable().flash(success, 'success')

data/app/helpers/effective_datatables_helper.rb

@@ -57,7 +57,7 @@ module EffectiveDatatablesHelper
         'simple' => simple.to_s,
         'spinner' => icon('spinner'), # effective_bootstrap
         'source' => effective_datatables.datatable_path(datatable, {format: 'json'}),
-        'total-records' => datatable.to_json[:recordsTotal],
+        'total-records' => datatable.to_json[:recordsTotal]
       }
     }
 

data/app/helpers/effective_datatables_private_helper.rb

@@ -114,8 +114,7 @@ module EffectiveDatatablesPrivateHelper
   end
 
   def datatable_filter_tag(form, datatable, name, opts)
-    as = opts.delete(:as).to_s.chomp('_field').to_sym
-    collection = opts.delete(:collection)
+    as = opts[:as].to_s.chomp('_field').to_sym
     value = datatable.state[:filter][name]
 
     options = {
@@ -125,13 +124,13 @@ module EffectiveDatatablesPrivateHelper
       placeholder: (opts[:label] || name.to_s.titleize),
       value: value,
       wrapper: { class: 'form-group col-auto'}
-    }.merge(opts.except(:parse))
+    }.merge(opts.except(:as, :collection, :parse))
 
     options[:name] = '' unless datatable._filters_form_required?
 
-    if collection.present?
+    if [:select, :radios, :checks].include?(as)
       options.delete(:name) unless as == :select
-      form.public_send(as, name, collection, options) # select, radios, checks
+      form.public_send(as, name, opts[:collection], options) # select, radios, checks
     elsif form.respond_to?(as)
       form.public_send(as, name, options) # check_box, text_area
     else

data/app/models/effective/effective_datatable/dsl/bulk_actions.rb

@@ -3,12 +3,12 @@ module Effective
     module Dsl
       module BulkActions
 
-        def bulk_action(*args)
-          datatable._bulk_actions.push(link_to_bulk_action(*args))
+        def bulk_action(title, url, opts = {})
+          datatable._bulk_actions.push(link_to_bulk_action(title, url, opts))
         end
 
-        def bulk_download(*args)
-          datatable._bulk_actions.push(link_to_bulk_action(*args.merge('data-authenticity-token' => form_authenticity_token, 'data-method' => :post)))
+        def bulk_download(title, url, opts = {})
+          datatable._bulk_actions.push(link_to_bulk_action(title, url, opts.merge('data-bulk-download': true)))
         end
 
         def bulk_action_divider
@@ -22,7 +22,7 @@ module Effective
         private
 
         # We can't let any data-method be applied to the link, or jquery_ujs does the wrong thing with it
-        def link_to_bulk_action(body, url, opts = {})
+        def link_to_bulk_action(title, url, opts = {})
 
           # Transform data: { ... } hash into 'data-' keys
           if (data = opts.delete(:data))
@@ -34,7 +34,7 @@ module Effective
 
           opts[:class] = [opts[:class], 'dropdown-item'].compact.join(' ')
 
-          link_to(body, url, opts)
+          link_to(title, url, opts)
         end
 
       end

data/app/models/effective/effective_datatable/dsl/filters.rb

@@ -5,7 +5,7 @@ module Effective
         def filter(name = nil, value = :_no_value, as: nil, label: nil, parse: nil, required: false, **input_html)
           return datatable.filter if (name == nil && value == :_no_value) # This lets block methods call 'filter' and get the values
 
-          raise 'expected second argument to be a value' if value == :_no_value
+          raise 'expected second argument to be a value. the default value for this filter.' if value == :_no_value
           raise 'parse must be a Proc' if parse.present? && !parse.kind_of?(Proc)
 
           # Merge search

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.5.0'.freeze
+  VERSION = '4.5.1'.freeze
 end

metadata

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