effective_datatables 3.7.5 → 3.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffda731c223c88524c9b86916f9a699cd23a388538b18a9687229a054bdb8ec9
-  data.tar.gz: 7580eb3b4b06a7d36b5ba2ddfa92d159c9cb42d5a5240cc811453d037a12d3dc
+  metadata.gz: 5447344cbeb4009c6eebd58b3ac8e32abcba744721a4f46153c37da2f8cd31e8
+  data.tar.gz: 6d9038d2d14bd9ca31feea1510ba49c44123107bad931396ed47632d3aa4c001
 SHA512:
-  metadata.gz: 2d07acd93b0557e28e24363ec4d68bd46d6c19f67544acfa8e66dcccadc5e4510199cfc2be3a9f89f1ddbadcd537518983f2a6b08994733ec83997e10ba1b524
-  data.tar.gz: a71389bfb336ecf7e7030383061438895c4af0f14f55d6f89f6bc8182adab7580d42e65fa319ea730f7262c8812fae4cc2ec954886c2769def6348d3d95ad8fc
+  metadata.gz: eee207a58d6ae1197830df69f75aa7f9adfdbfb913e7fa14357e10e3cebe0e47c68fccd803facf486e2d302d5108cbb4edf46210bad01436962dbe38c36a7ef6
+  data.tar.gz: 82dcfe1f94fcbbad17fe7d9d82f4301e2d3b8d7c4b3a8101afc657f90bec08da99fd40e729f33ee8ff051b99bb379dae7bdf909213be34fe36075e0d85cbfd96

data/app/helpers/effective_datatables_private_helper.rb

@@ -176,15 +176,15 @@ module EffectiveDatatablesPrivateHelper
     collection = opts[:collection]
     input_html = opts[:input_html] || {}
 
-    form.input name,
+    attributes = {
       value: value,
       selected: value,
       as: as,
       collection: collection,
       label: opts[:label],
-      required: input_html.delete(:required),
-      multiple: input_html.delete(:multiple),
-      include_blank: input_html.delete(:include_blank),
+      required: input_html.delete(:required) || opts[:required],
+      multiple: input_html.delete(:multiple) || opts[:multiple],
+      include_blank: input_html.delete(:include_blank) || opts[:include_blank],
       group_method: input_html.delete(:group_method),
       group_label_method: input_html.delete(:group_label_method),
       value_method: input_html.delete(:value_method),
@@ -192,6 +192,9 @@ module EffectiveDatatablesPrivateHelper
       input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(input_html),
       input_js: ({ placeholder: ''} if as == :effective_select),
       wrapper_html: {class: 'form-group-sm'}
+    }.compact
+
+    form.input name, **attributes
   end
 
   def datatable_scope_tag(form, datatable, opts = {})

data/app/models/effective/datatable_value_tool.rb

@@ -94,10 +94,10 @@ module Effective
 
         case column[:as]
         when :boolean
-          if fuzzy
-            term ? (obj == true) : (obj != true)
+          if term
+            ['Yes', 'yes', true, 'true', '1'].include?(value)
           else
-            obj == term
+            ['No', 'no', false, 'false', '0'].include?(value)
           end
         when :datetime, :date
           end_at = (

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.7.5'.freeze
+  VERSION = '3.7.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.7.5
+  version: 3.7.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails