effective_datatables 2.5.1 → 2.5.2
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: 55a0122f14dc9a689508875d0f878461ffef5772
|
4
|
+
data.tar.gz: 2b6861ee3bf35e581875e3e9949f8ddd5100e20a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d289a862ca4d537477dfed7df7660235a296f3df3720b7045d7ec000250a95fac7a346588601382f6a4358e3776e6f3b9cf0d6caa80bbb02ff0f17bd28c274b1
|
7
|
+
data.tar.gz: f5cbe997187012f9f369c1cba6c8e9b3f3dd07ab3680fa09034f4fda68cabdb9240546818a84bc3609f941ac7092d5a5934a0bedcafdc99de379074003a07027
|
@@ -78,7 +78,8 @@ module Effective
|
|
78
78
|
options[:block] = block
|
79
79
|
end
|
80
80
|
|
81
|
-
|
81
|
+
# This needs to be a {} not WithIndifferentAccess or rendering _scopes won't work correctly
|
82
|
+
(@scopes ||= {})[name] = options.merge(default: default)
|
82
83
|
end
|
83
84
|
|
84
85
|
def aggregate(name, options = {}, &block)
|
@@ -29,9 +29,10 @@ module Effective
|
|
29
29
|
(scopes || []).each do |name, options|
|
30
30
|
value = attributes.key?(name) ? attributes[name] : options[:default]
|
31
31
|
|
32
|
-
options[:filter] ||=
|
33
|
-
options[:filter][:input_html] ||=
|
32
|
+
options[:filter] ||= {}
|
33
|
+
options[:filter][:input_html] ||= {}
|
34
34
|
options[:filter][:input_html][:value] = value
|
35
|
+
options[:filter][:selected] = value
|
35
36
|
|
36
37
|
if attributes.key?(name) == false
|
37
38
|
self.attributes[name] = options[:default]
|