effective_datatables 4.8.9 → 4.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2dfe401e2839d034033b2af1b0048cf3c6a726b87a1f6ccc4354eb71183f55
-  data.tar.gz: b6c6a44db10ce020e32bd79de4f1dc8a77106122f7725524414e0ccfa2ee4265
+  metadata.gz: 065a97713aa78f1febed39ab02736af303742cc15a691fa556f60225035bdc91
+  data.tar.gz: dcfe7909bd5e6a30a16ca700bdaf01721ca95590a58b36ee20c5f17f446faa36
 SHA512:
-  metadata.gz: 75201440e6f62b181ebce2f54dbaedcffae413a42803e1b0e39a7869f8425e776d51b10b88c2625d142a89895eb6f4ab3f174715782bdb068c5958908b0e36a3
-  data.tar.gz: b9442dab7b1f1b7a1b34e39ec1b67e3241757b1978272ea051c01cf77a9ae074b1ccac33aa18cc52a84a1f735697b41c72fba970a1d39a0c1a734d40c17f125c
+  metadata.gz: ea4bd624315535fd4eca9ae8abef4176c10fc7033e0dc45cf2d6fa56a439dad5adbf81a5249d727b02c0e4a0f6d799710779fd69b8d80aaab779c2b3dadb716c
+  data.tar.gz: 075defd26c55ed28f71dc6a8becd9efb71c2edf51799c56568b8fbfc612689e95b0cf3bdfe7b7447eb858261b11a1878366792074ba254cef7b2c0e0cb6eaecb

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

@@ -52,7 +52,7 @@ initializeDataTables = (target) ->
       displayStart: datatable.data('display-start')
       iDisplayLength: datatable.data('display-length')
       language: datatable.data('language')
-      lengthMenu: [[5, 10, 25, 50, 100, 250, 500, 9999999], ['5', '10', '25', '50', '100', '250', '500', 'All']]
+      lengthMenu: [[5, 10, 25, 50, 100, 250, 500, 9999999], ['5', '10', '25', '50', '100', '250', '500', datatable.data('all-label')]]
       order: datatable.data('display-order')
       processing: true
       responsive: true
@@ -80,7 +80,7 @@ initializeDataTables = (target) ->
               filter_name = name.replace('filters[', '').substring(0, name.length-9)
 
               params['filter'][filter_name] = $form.find("input[name='#{name}']:checked").val()
-              
+
             else if $input.attr('id')
               filter_name = $input.attr('id').replace('filters_', '')
               params['filter'][filter_name] = $input.val()
@@ -165,7 +165,6 @@ initializeDataTables = (target) ->
           $input.on 'change', (event) -> dataTableSearch($(event.currentTarget))
         else if $input.is('input')
           $input.delayedChange ($input) -> dataTableSearch($input)
-          $input.on('paste', -> dataTableSearch($input))
 
     # Do the actual search
     dataTableSearch = ($input) ->   # This is the function called by a select or input to run the search

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

@@ -8,7 +8,14 @@ reorder = (event, diff, edit) ->
   return unless oldNode? && newNode?
 
   url = @context[0].ajax.url.replace('.json', '/reorder.json')
-  data = {'reorder[id]': oldNode.data('reorder-resource'), 'reorder[old]': oldNode.val(), 'reorder[new]': newNode.val(), attributes: $table.data('attributes') }
+
+  data = {
+    'authenticity_token': $('head').find("meta[name='csrf-token']").attr('content'),
+    'reorder[id]': oldNode.data('reorder-resource'),
+    'reorder[old]': oldNode.val(),
+    'reorder[new]': newNode.val(),
+    'attributes': $table.data('attributes')
+  }
 
   @context[0].rowreorder.c.enable = false
 
@@ -40,4 +47,3 @@ $(document).on 'click', '.dataTables_wrapper a.buttons-reorder', (event) ->
     $table.addClass('reordering')
 
   column.visible(!column.visible())
-

data/app/assets/javascripts/vendor/jquery.delayedChange.js

@@ -14,7 +14,7 @@
 
     return this.each(function() {
       var element = $(this);
-      element.keyup(function() {
+      element.on('keyup paste', function() {
         clearTimeout(timer);
         timer = setTimeout(function() {
           var newVal = element.val();

data/app/helpers/effective_datatables_helper.rb

@@ -40,6 +40,7 @@ module EffectiveDatatablesHelper
       id: datatable.to_param,
       class: html_class,
       data: {
+        'all-label' => I18n.t('effective_datatables.all'),
         'attributes' => EffectiveDatatables.encrypt(datatable.attributes),
         'authenticity-token' => form_authenticity_token,
         'bulk-actions' => datatable_bulk_actions(datatable),

data/app/models/effective/datatable.rb

@@ -1,8 +1,8 @@
 module Effective
   class Datatable
     attr_reader :attributes # Anything that we initialize our table with. That's it. Can't be changed by state.
-    attr_reader :effective_resource
     attr_reader :state
+    attr_accessor :effective_resource
 
     # Hashes of DSL options
     attr_reader :_aggregates

data/app/models/effective/effective_datatable/format.rb

@@ -88,9 +88,9 @@ module Effective
         when :currency
           view.number_to_currency(value)
         when :date
-          (value.strftime('%F') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_date) : BLANK
         when :datetime
-          (value.strftime('%F %H:%M') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_datetime) : BLANK
         when :decimal
           value
         when :duration
@@ -116,7 +116,7 @@ module Effective
           when Numeric    ; view.number_to_currency(value)
           end
         when :time
-          (value.strftime('%H:%M') rescue BLANK)
+          value.respond_to?(:strftime) ? value.strftime(EffectiveDatatables.format_time) : BLANK
         else
           value.to_s
         end

data/app/models/effective/effective_datatable/resource.rb

@@ -31,7 +31,7 @@ module Effective
       end
 
       def load_effective_resource!
-        @effective_resource = if active_record_collection?
+        @effective_resource ||= if active_record_collection?
           Effective::Resource.new(collection_class, namespace: controller_namespace)
         end
       end

data/config/effective_datatables.rb

@@ -39,4 +39,8 @@ EffectiveDatatables.setup do |config|
   config.cookie_domain = :all         # Should usually be :all
   config.cookie_tld_length = nil      # Leave nil to autodetect, or set to probably 2
 
+  # Date formatting
+  config.format_datetime = '%F %H:%M'
+  config.format_date = '%F'
+  config.format_time = '%H:%M'
 end

data/config/locales/en.yml

@@ -9,4 +9,5 @@ en:
     bulk_actions: Bulk Actions
     applying: Applying...
     boolean_true: 'Yes'
-    boolean_false: 'No'
+    boolean_false: 'No'
+    all: All

data/config/locales/es.yml

@@ -9,4 +9,5 @@ es:
     bulk_actions: Acciones en masa
     applying: Filtrando...
     boolean_true: 'Sí'
-    boolean_false: 'No'
+    boolean_false: 'No'
+    all: Todo

data/config/locales/nl.yml

@@ -9,4 +9,5 @@ nl:
     bulk_actions: Bulkacties
     applying: Toepassen...
     boolean_true: 'Ja'
-    boolean_false: 'Nee'
+    boolean_false: 'Nee'
+    all: Te doen

data/lib/effective_datatables.rb

@@ -16,6 +16,10 @@ module EffectiveDatatables
   mattr_accessor :cookie_domain
   mattr_accessor :cookie_tld_length
 
+  mattr_accessor :format_datetime
+  mattr_accessor :format_date
+  mattr_accessor :format_time
+
   mattr_accessor :debug
 
   alias_method :max_cookie_size, :cookie_max_size

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.8.9'.freeze
+  VERSION = '4.8.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.8.9
+  version: 4.8.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2021-01-15 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.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord