effective_datatables 3.3.9 → 3.3.10
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:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b71c7b87a3cf6891b8de4f83a2c1516e9b4aeb2e
|
4
|
+
data.tar.gz: dce5ed1209840652ce2f60dd551eb33090e6e9dc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a00004b787edf69a656abdfffe5bbdf2a0a60106b539af3fe66fd374fc8a2fa3125916e6a2d25b64582f17062037727309dbbd0fc73ed689fc1453f0d546fb36
|
7
|
+
data.tar.gz: a291e7181d8876804dfc4ed4d1c15d122db1d3c09269effd210a314cc35e6ae1d0496788d87df86f051b16e15df88312941ff3bd438962e17eaeccfc5a8aee4e
|
data/README.md
CHANGED
@@ -665,6 +665,8 @@ filters do
|
|
665
665
|
filter :start_date, Time.zone.now-3.months, required: true
|
666
666
|
filter :end_date, nil, parse: -> { |term| Time.zone.local(term).end_of_day }
|
667
667
|
filter :user, current_user, as: :select, collection: User.all
|
668
|
+
filter :year, 2018, as: :select, collection: [2018, 2017], label: false, include_blank: false
|
669
|
+
filter :reports, '2018', as: :grouped_select, collection: [['Years', [['2017', '2017'], ['2018', '2018']]], ['Months', [['January', '1'], ['February', '2']]]], group_method: :last
|
668
670
|
end
|
669
671
|
```
|
670
672
|
|
@@ -11,11 +11,11 @@ module Effective
|
|
11
11
|
datatable._filters[name.to_sym] = {
|
12
12
|
value: value,
|
13
13
|
as: as,
|
14
|
-
label: label || name.to_s.titleize,
|
14
|
+
label: label || (label == false ? false : name.to_s.titleize),
|
15
15
|
name: name.to_sym,
|
16
16
|
parse: parse,
|
17
17
|
required: required,
|
18
|
-
input_html: input_html
|
18
|
+
input_html: input_html.merge({ value: value })
|
19
19
|
}
|
20
20
|
end
|
21
21
|
|
@@ -13,9 +13,15 @@
|
|
13
13
|
.effective-datatables-filters-inputs
|
14
14
|
- datatable._filters.each do |name, opts|
|
15
15
|
= form.input name, label: opts[:label], required: false, value: datatable.state[:filter][name],
|
16
|
+
selected: datatable.state[:filter][name],
|
16
17
|
as: opts[:as],
|
17
18
|
collection: opts[:input_html].delete(:collection),
|
18
19
|
multiple: opts[:input_html].delete(:multiple),
|
20
|
+
include_blank: opts[:input_html].delete(:include_blank),
|
21
|
+
group_method: opts[:input_html].delete(:group_method),
|
22
|
+
group_label_method: opts[:input_html].delete(:group_label_method),
|
23
|
+
value_method: opts[:input_html].delete(:value_method),
|
24
|
+
label_method: opts[:input_html].delete(:label_method),
|
19
25
|
input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html]),
|
20
26
|
input_js: ({ placeholder: ''} if opts[:as] == :effective_select),
|
21
27
|
wrapper_html: {class: 'form-group-sm'}
|
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: 3.3.
|
4
|
+
version: 3.3.10
|
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: 2018-01-
|
11
|
+
date: 2018-01-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
180
180
|
version: '0'
|
181
181
|
requirements: []
|
182
182
|
rubyforge_project:
|
183
|
-
rubygems_version: 2.
|
183
|
+
rubygems_version: 2.6.14
|
184
184
|
signing_key:
|
185
185
|
specification_version: 4
|
186
186
|
summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord
|