effective_datatables 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d7792aa079e82cd58a5ee658a5a8454d3ac1301
-  data.tar.gz: da718d66a6ca3389ece9b34391922dadae5b935f
+  metadata.gz: 80ef322422055559272f3145551bff1357ee74e5
+  data.tar.gz: 28bc97f374afb93abd7bf5a8007044a37afffef7
 SHA512:
-  metadata.gz: b45cb2de1ee4a1b6c1ed15d1e048c612a70ec736b229bfa54f631ffa7960d00108b2dd84cadf48a336a9d2d07a09532ad81e7d1c62d556d38efaeb062971d6d3
-  data.tar.gz: ee93bad3e2c85ba5b873e9fee967518dc2425cabe4d204d632cf661a9c8dcd9ef22589b050ea0ca5f42c5871cc9fddac4d48a884eb61ae990e69487eae7cc97a
+  metadata.gz: 8ca29bb7239a4e4b526b628053926b7308020b01c41b3d4ca557eaff74be562f6c90df91b356794ab88a9bcdb35125d473d5927d34f9340fcfb2e4fd466f34df
+  data.tar.gz: d5d5ed8d06bc00aae6a3bfd046830d9f7f2d428ce95d6b3893698d29ed18a0f6d7b999f5f1fcde49fe5d43209cd33c9bb366e0f2be9bc0c4475b5118cf981f2b

data/README.md

@@ -705,7 +705,9 @@ Creates a link that becomes clickable when one or more checkbox/rows are selecte
 
 A controller action must be created to accept a POST with an array of selected ids, `params[:ids]`.
 
-This is a pass-through to `link_to` and accepts all the same options, except that the method `POST` is forced.
+This is a pass-through to `link_to` and accepts all the same options, except that the method `POST` is used by default.
+
+You can also specify `data-method: :get` to instead make a `GET` request with the selected ids and redirect the browser link a normal link.
 
 ```ruby
 bulk_actions do
@@ -742,17 +744,17 @@ end
 or if using [effective_resources](https://github.com/code-and-effect/effective_resources):
 
 ```ruby
-  include Effective::CrudController
+include Effective::CrudController
 
-  collection_action :bulk_approve
+collection_action :bulk_approve
 ```
 
 and in your model
 
 ```ruby
-  def approve!
-    update_attributes!(status: :approved)
-  end
+def approve!
+  update_attributes!(status: :approved)
+end
 ```
 
 ### bulk_action_divider

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

@@ -38,11 +38,20 @@ $(document).on 'click', '.buttons-bulk-actions a', (event) ->
 
   url = $bulkAction.attr('href')
   title = $bulkAction.text()
-  values = $.map($selected, (input) -> input.getAttribute('value'))
   token = $bulkAction.parent('li').data('authenticity-token')
+  values = $.map($selected, (input) -> input.getAttribute('value'))
+  get_link = $bulkAction.data('bulk-actions-get')
 
   return unless url && values
 
+  if get_link
+    if url.includes('?')
+      window.location.assign(url + '&' + $.param({ids: values}))
+    else
+      window.location.assign(url + '?' + $.param({ids: values}))
+
+    return
+
   # Disable the Bulk Actions dropdown, so only one can be run at a time
   $bulkAction.closest('button').attr('disabled', 'disabled')
 

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -187,6 +187,8 @@ table.dataTable {
     input[type='checkbox'] { margin-left: 1px; margin-right: 1px; }
   }
 
+  td.col-resource_item { word-break: keep-all; }
+
   td {
     p { margin-bottom: 0px; }
   }

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

@@ -4,11 +4,11 @@ module Effective
       module BulkActions
 
         def bulk_action(*args)
-          datatable._bulk_actions.push(content_tag(:li, link_to(*args)))
+          datatable._bulk_actions.push(content_tag(:li, link_to_bulk_action(*args)))
         end
 
         def bulk_download(*args)
-          datatable._bulk_actions.push(content_tag(:li, link_to(*args), 'data-authenticity-token' => form_authenticity_token))
+          datatable._bulk_actions.push(content_tag(:li, link_to_bulk_action(*args), 'data-authenticity-token' => form_authenticity_token))
         end
 
         def bulk_action_divider
@@ -19,6 +19,31 @@ module Effective
           datatable._bulk_actions.push(block.call)
         end
 
+        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(*args)
+          args.map! do |arg|
+            if arg.kind_of?(Hash)
+              data_method = (
+                arg.delete(:'data-method') ||
+                arg.delete('data-method') ||
+                (arg[:data] || {}).delete('method') ||
+                (arg[:data] || {}).delete(:method)
+              )
+
+              # But if the data-method was :get, we add bulk-actions-get-link = true
+              if data_method.to_s == 'get'
+                arg[:data].present? ? arg[:data]['bulk-actions-get'] = true : arg['data-bulk-actions-get'] = true
+              end
+            end
+
+            arg
+          end
+
+          link_to(*args)
+        end
+
       end
     end
   end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.3.5'.freeze
+  VERSION = '3.3.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails