effective_datatables 2.4.4 → 2.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/helpers/effective_datatables_helper.rb +10 -7
- data/lib/effective_datatables/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6d159cc1ddb97f8595ea993ca8e538b412577cc3
|
|
4
|
+
data.tar.gz: 0bb7015ca673162be2f4b9557a1e0f444ffa139a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6c770a91c59e1801c4e02b2676e43c2063cdb82880d37620458c6bbaaaf531ecc050461900d38e045707828cac7c87a09d635aa0604b48b2134de256b7063377
|
|
7
|
+
data.tar.gz: 1d93556e75ba8f1d90ff3fdd9bc8ad668c0623afc81f3331117526f66938f00f10e1bd5e178b8745a994dc2f048db6724c66e865f8164abd493d98c074dbfff8
|
|
@@ -54,23 +54,26 @@ module EffectiveDatatablesHelper
|
|
|
54
54
|
def datatable_header_filter(form, name, value, opts)
|
|
55
55
|
return render(partial: opts[:header_partial], locals: {form: form, name: (opts[:label] || name), column: opts}) if opts[:header_partial].present?
|
|
56
56
|
|
|
57
|
+
include_blank = opts[:filter].key?(:include_blank) ? opts[:filter][:include_blank] : (opts[:label] || name.titleize)
|
|
58
|
+
placeholder = opts[:filter].key?(:placeholder) ? opts[:filter][:placeholder] : (opts[:label] || name.titleize)
|
|
59
|
+
|
|
57
60
|
case opts[:filter][:as]
|
|
58
61
|
when :string, :text, :number
|
|
59
62
|
form.input name, label: false, required: false, value: value,
|
|
60
63
|
as: :string,
|
|
61
|
-
placeholder:
|
|
64
|
+
placeholder: placeholder,
|
|
62
65
|
input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
|
|
63
66
|
when :date
|
|
64
67
|
form.input name, label: false, required: false, value: value,
|
|
65
68
|
as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_picker) ? :effective_date_picker : :string),
|
|
66
|
-
placeholder:
|
|
69
|
+
placeholder: placeholder,
|
|
67
70
|
input_group: false,
|
|
68
71
|
input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
|
|
69
72
|
input_js: { useStrict: true, keepInvalid: true }
|
|
70
73
|
when :datetime
|
|
71
74
|
form.input name, label: false, required: false, value: value,
|
|
72
75
|
as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_time_picker) ? :effective_date_time_picker : :string),
|
|
73
|
-
placeholder:
|
|
76
|
+
placeholder: placeholder,
|
|
74
77
|
input_group: false,
|
|
75
78
|
input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
|
|
76
79
|
input_js: { useStrict: true, keepInvalid: true } # Keep invalid format like "2015-11" so we can still filter by year, month or day
|
|
@@ -80,22 +83,22 @@ module EffectiveDatatablesHelper
|
|
|
80
83
|
collection: opts[:filter][:collection],
|
|
81
84
|
selected: opts[:filter][:selected],
|
|
82
85
|
multiple: opts[:filter][:multiple] == true,
|
|
83
|
-
include_blank:
|
|
86
|
+
include_blank: include_blank,
|
|
84
87
|
input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
|
|
85
|
-
input_js: { placeholder:
|
|
88
|
+
input_js: { placeholder: placeholder }
|
|
86
89
|
when :grouped_select
|
|
87
90
|
form.input name, label: false, required: false, value: value,
|
|
88
91
|
as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_select) ? :effective_select : :grouped_select),
|
|
89
92
|
collection: opts[:filter][:collection],
|
|
90
93
|
selected: opts[:filter][:selected],
|
|
91
94
|
multiple: opts[:filter][:multiple] == true,
|
|
92
|
-
include_blank:
|
|
95
|
+
include_blank: include_blank,
|
|
93
96
|
grouped: true,
|
|
94
97
|
polymorphic: opts[:filter][:polymorphic] == true,
|
|
95
98
|
group_label_method: opts[:filter][:group_label_method] || :first,
|
|
96
99
|
group_method: opts[:filter][:group_method] || :last,
|
|
97
100
|
input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
|
|
98
|
-
input_js: { placeholder:
|
|
101
|
+
input_js: { placeholder: placeholder }
|
|
99
102
|
when :bulk_actions_column
|
|
100
103
|
form.input name, label: false, required: false, value: nil,
|
|
101
104
|
as: :boolean,
|
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: 2.4.
|
|
4
|
+
version: 2.4.5
|
|
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: 2016-06-
|
|
11
|
+
date: 2016-06-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|