effective_datatables 4.4.5 → 4.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158ddf59a09940c2dee6187aa2e206104f8552e8
-  data.tar.gz: ea19c893a0e184003d5f60007a171efd07417003
+  metadata.gz: 06f51c05dbf844ec08e797fc26723a9e680b7b01
+  data.tar.gz: f1c9c9e23fb8199df78cf2d5059d4d520fe42c77
 SHA512:
-  metadata.gz: 86fe5b9307c518671509dce63bdc6e4b9e99c9a6af22fb992aca3eeee61fba645f3028f1d89702ae0578ae0961dab091b15758e8f81c61c29a9b611ba4b2f86f
-  data.tar.gz: c775b5445a7a328e04b48c24ca6bf9fc2da86c6fdc7cf0860d6dd69d75379e200f5d104085a7a6c9256ba96041e9c322971e1669db61315c86691efd9c9db94e
+  metadata.gz: c0fc7e3f321ebb3c873ecdba4d4cba89d2590a449b5591ed42a7ac3a72a937e87d40c3f33ba00baac6d1221538aee48964ac9f9d1af3e9397ea8188b8f530874
+  data.tar.gz: 098d5a6eee6e134b024c9fd7ec588353071f0b94a4a7c7b62cfdb26e0f8cf03b40bbe7b7de67e753f5915b3c8bcd9e08b4eb5ff27d6eaaf2c46d7185eb8ef3bc

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

@@ -68,10 +68,20 @@ initializeDataTables = (target) ->
           params['scope'] = $form.find("input[name='filters[scope]']:checked").val() || ''
           params['filter'] = {}
 
-          $form.find("select,textarea,input:not([type=submit]):not([name='filters[scope]'])").each ->
+          $form.find("select,textarea,input:not([type=submit])").each ->
             $input = $(this)
-            if $input.attr('id')
-              params['filter'][$input.attr('id').substring(8, $input.attr('id').length)] = $input.val()
+
+            if ['utf8', 'authenticity_token', 'filters[scope]'].includes($input.attr('name'))
+              # Skipped
+            else if $input.attr('type') == 'radio'
+              name = $input.attr('name')
+              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()
 
       serverSide: true
       scrollCollapse: true

data/app/helpers/effective_datatables_private_helper.rb

@@ -114,44 +114,40 @@ module EffectiveDatatablesPrivateHelper
   end
 
   def datatable_filter_tag(form, datatable, name, opts)
-    placeholder = opts.delete(:label)
-
+    as = opts.delete(:as).to_s.chomp('_field').to_sym
     collection = opts.delete(:collection)
     value = datatable.state[:filter][name]
 
-    options = opts.except(:parse).merge(
+    options = {
       autocomplete: 'off',
       feedback: false,
       label: false,
-      placeholder: placeholder,
+      placeholder: (opts[:label] || name.to_s.titleize),
       value: value,
       wrapper: { class: 'form-group col-auto'}
-    )
+    }.merge(opts.except(:parse))
 
     options[:name] = '' unless datatable._filters_form_required?
 
-    case options.delete(:as)
-    when :date
-      form.date_field name, options
-    when :datetime
-      form.datetime_field name, options
-    when :time
-      form.time_field name, options
-    when :select, :boolean
-      options[:input_js] = (options[:input_js] || {}).reverse_merge(placeholder: placeholder)
-      form.select name, collection, options
+    if collection.present?
+      options.delete(:name) unless as == :select
+      form.public_send(as, name, collection, options) # select, radios, checks
+    elsif form.respond_to?(as)
+      form.public_send(as, name, options) # check_box, text_area
     else
-      form.text_field name, options
+      form.public_send("#{as}_field", name, options) # text_field, number_field, all the rest.
     end
+
   end
 
   def datatable_scope_tag(form, datatable, opts = {})
     collection = datatable._scopes.map { |name, opts| [opts[:label], name] }
+    value = datatable.state[:scope]
 
     options = {
       autocomplete: 'off',
       buttons: true,
-      checked: datatable.state[:scope],
+      checked: value,
       feedback: false,
       label: false,
       required: false,

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

@@ -25,11 +25,11 @@ module Effective
           datatable._filters[name.to_sym] = {
             value: value,
             as: as,
-            label: label || (label == false ? false : name.to_s.titleize),
+            label: label,
             name: name.to_sym,
             parse: parse,
             required: required,
-          }.reverse_merge(input_html)
+          }.compact.reverse_merge(input_html)
         end
 
         def scope(name = nil, *args, default: nil, label: nil)

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

@@ -1,5 +1,5 @@
 .effective-datatables-filters{'aria-controls': datatable.to_param}
-  = effective_form_with(scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb]) do |form|
+  = effective_form_with(scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], id: nil) do |form|
     .form-row.align-items-center
       - if datatable._scopes.present?
         = datatable_scope_tag(form, datatable)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.4.5'.freeze
+  VERSION = '4.4.6'.freeze
 end

metadata

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