effective_datatables 3.0.11 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26947cf7b14ada26ae6389b6a0af0f8daca8dfef
-  data.tar.gz: 97f74782767e176a67369fa9773a36019f29cab7
+  metadata.gz: 2a1626857c2a0dd2d2d4e730186ff2123cedf701
+  data.tar.gz: 7a80e24148043b834218b0162e51c346a1d9856a
 SHA512:
-  metadata.gz: 9369d9157d9dd721d46f8bb8bba0edde23717e509960a7aa9a264db62ad31b2df0790305b117aa2683feebcecde90be8cd390cb7ee9f273ae3256b3f12c6170c
-  data.tar.gz: 314be80b76661a21f5a037e9950282daa54536410c62b9acbcb03ff203e64eeb83a04281a38376fb82a84958eb6826260bfc3a264ed69a8fe8b400459e8c404b
+  metadata.gz: adf07bd4b115a2b41105ee02757aa338c330cb9fe7a9d643d8c1c13cd96d3bcb6d6acc15bc45c4c3e3f097dde54a2cd3ea4fef8192f626bf95f2a07e389fe372
+  data.tar.gz: 03d4581beee321e9101f2cde363759214be28e2d4ade1271b07ab95eacb2ebeef466c9742f6cdfbb8861b226cba61e66e3811d46bce05d77a264b15243007dda

data/README.md

@@ -861,7 +861,9 @@ The built-in search and ordering can be overridden on a per-column basis.
 
 The only gotcha here is that you must be aware of the type of collection.
 
-In the case of a `col` and an ActiveRecord-based collection:
+### With ActiveRecord collection
+
+In the case of a `col` and an ActiveRecord collection:
 
 ```ruby
 collection do
@@ -885,7 +887,15 @@ datatable do
 end
 ```
 
-And in the case of a `col` with an Array-based collection, or any `val`:
+If you run into issues where `collection` here is an Array, you're probably using some joins in your `collection do ... end` block.
+
+If `column[:sql_column].blank?` then this `col` has fallen back to being a `val`.
+
+Try adding `col :post_category, sql_column: 'post_categories.title'`
+
+### With Array collection
+
+And in the case of a `col` with an Array collection, or any `val`:
 
 ```ruby
 collection do

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

@@ -1,7 +1,11 @@
-$(document).on 'click', 'a.buttons-reset-cookie', (event) ->
-  event.preventDefault()
+$(document).on 'click', 'a.buttons-reset-search', (event) ->
+  event.preventDefault() # prevent the click
+
+  $table = $(event.currentTarget).closest('.dataTables_wrapper').find('table.dataTable').first()
+  $thead = $table.children('thead').first()
+
+  $thead.find('input').val('').removeAttr('checked').removeAttr('selected')
+  $thead.find('select').val('').trigger('change.select2')
+
+  $table.DataTable().search('').columns().search('').draw()
 
-  $obj = $(event.currentTarget)
-  $obj.find('span').text('Resetting...')
-  document.cookie = "_effective_dt=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/"
-  location.reload()

data/app/views/effective/datatables/_reset.html.haml

@@ -1,2 +1,2 @@
-%a.btn.btn-default.buttons-reset-cookie{href: '#'}
+%a.btn.btn-default.buttons-reset-search{href: '#'}
   %span Reset

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.11'.freeze
+  VERSION = '3.0.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails