effective_datatables 4.5.3 → 4.5.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f73868f30d757dbceec3c540399e657f754140ba
4
- data.tar.gz: ac64d4fd479f389703a2d8ff33a13c96baef82b3
3
+ metadata.gz: 46c2b80e16dfa740ee19ff5cd4491a547905752d
4
+ data.tar.gz: 1b302fc67255693c67d983a1af3163e59b996fd5
5
5
  SHA512:
6
- metadata.gz: 554a2ba6fa77dda79130231dfb466b294de74ae17e7770a46af79a29bfba91f8b2f2f3d3e4c4e7f6464d0b34e2f4f22f7b4e909411769c9ba559cde39578736a
7
- data.tar.gz: e2cd5f8b2131b6ea9cbac07b73e46bf006c69ebc17866921e7121e2ffbf5fc61634793da5f60832b989c192f5419d343cfc409241018948a3094c0029b6aaf1b
6
+ metadata.gz: fe3e8589171d7e74e5603714876ae1329b29c52ff497164dec56483e2b1e92e6d165907795b952eb8b58db204f6a983a96cdc80c51850e8a50bc5ec8452f5371
7
+ data.tar.gz: 4bb991c69450190b8d851c8074afd1ee3e3c9466f1d3187af619c93069ba21df74bffa704110716bce0b566dfef2782ce3e42d66b8abd530126b9eaceff00ffc
@@ -116,6 +116,7 @@ module EffectiveDatatablesPrivateHelper
116
116
  def datatable_filter_tag(form, datatable, name, opts)
117
117
  as = opts[:as].to_s.chomp('_field').to_sym
118
118
  value = datatable.state[:filter][name]
119
+ collection = opts[:collection]
119
120
 
120
121
  options = {
121
122
  autocomplete: 'off',
@@ -130,7 +131,10 @@ module EffectiveDatatablesPrivateHelper
130
131
 
131
132
  if [:select, :radios, :checks].include?(as)
132
133
  options.delete(:name) unless as == :select
133
- form.public_send(as, name, opts[:collection], options) # select, radios, checks
134
+ form.public_send(as, name, collection, options) # select, radios, checks
135
+ elsif as == :boolean
136
+ collection ||= [true, false].map { |value| [t("effective_datatables.boolean_#{value}"), value] }
137
+ form.public_send(:select, name, collection, options) # boolean
134
138
  elsif form.respond_to?(as)
135
139
  form.public_send(as, name, options) # check_box, text_area
136
140
  else
@@ -17,10 +17,10 @@ module Effective
17
17
  as ||= (
18
18
  if input_html.key?(:collection)
19
19
  :select
20
- elsif value.present?
20
+ elsif value != nil
21
21
  Effective::Attribute.new(value).type
22
22
  end
23
- )
23
+ ) || :text
24
24
 
25
25
  datatable._filters[name.to_sym] = {
26
26
  value: value,
@@ -1,3 +1,3 @@
1
1
  module EffectiveDatatables
2
- VERSION = '4.5.3'.freeze
2
+ VERSION = '4.5.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_datatables
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.5.3
4
+ version: 4.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-05-02 00:00:00.000000000 Z
11
+ date: 2019-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails