effective_datatables 3.3.11 → 3.3.12
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: 0c6f07911418dbf41dd99b59319b024890f069c7
|
4
|
+
data.tar.gz: 95a408a68bd5c64c3e8e8ca7d19df6fc9e08fbb4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fd69b86ef935ea26ea7fe2a90593f10e2eb93457b9475b608daee0c814b6544b1eb798ec446551fa39f6b8978ec1f8bc7de97dbacf57c9f18a82be7fae4fccaa
|
7
|
+
data.tar.gz: 124632871b6345b24c7fb59bd3870e8048ea4ceb7d4edd99b13f8a442c3eb898f45dd08278d28b67bb38de410adbcae7f73b26fc6fd84a8bac5fefee29cf29a6
|
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
|
|
@@ -16,11 +16,11 @@ module Effective
|
|
16
16
|
datatable._filters[name.to_sym] = {
|
17
17
|
value: value,
|
18
18
|
as: as,
|
19
|
-
label: label || name.to_s.titleize,
|
19
|
+
label: label || (label == false ? false : name.to_s.titleize),
|
20
20
|
name: name.to_sym,
|
21
21
|
parse: parse,
|
22
22
|
required: required,
|
23
|
-
input_html: input_html
|
23
|
+
input_html: input_html.merge({ value: value })
|
24
24
|
}
|
25
25
|
end
|
26
26
|
|
@@ -16,9 +16,15 @@
|
|
16
16
|
label: opts[:label],
|
17
17
|
required: opts[:input_html].delete(:required),
|
18
18
|
value: datatable.state[:filter][name],
|
19
|
+
selected: datatable.state[:filter][name],
|
19
20
|
as: opts[:as],
|
20
21
|
collection: opts[:input_html].delete(:collection),
|
21
22
|
multiple: opts[:input_html].delete(:multiple),
|
23
|
+
include_blank: opts[:input_html].delete(:include_blank),
|
24
|
+
group_method: opts[:input_html].delete(:group_method),
|
25
|
+
group_label_method: opts[:input_html].delete(:group_label_method),
|
26
|
+
value_method: opts[:input_html].delete(:value_method),
|
27
|
+
label_method: opts[:input_html].delete(:label_method),
|
22
28
|
input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html]),
|
23
29
|
input_js: ({ placeholder: ''} if opts[:as] == :effective_select),
|
24
30
|
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.12
|
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-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|