refine-rails 2.9.3 → 2.9.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/refine/inline/criteria_controller.rb +2 -1
- data/app/models/refine/filters/blueprint_editor.rb +1 -0
- data/app/models/refine/filters/criterion.rb +1 -2
- data/app/models/refine/inline/criteria/date_refinement.rb +3 -2
- data/app/models/refine/inline/criteria/input.rb +2 -2
- data/app/models/refine/inline/criterion.rb +1 -2
- data/lib/refine/rails/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 40c314d4829c5c14ed3734c58f3fa00f6d48dffdb792c653f7be6baae19047a7
|
4
|
+
data.tar.gz: '096fbf9bc50779fa1cfd216f1e47d8f7429d0e1971c1516209a50759ab4774dd'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 63b4ea7e912c91fe2c360ad3aea673b8d5312d8a5ae8217749547e4e85f06d161e6dbf52c7489693a93ed35b639862464d59153ea2ba4d4c20e836e1e0ef3e36
|
7
|
+
data.tar.gz: ac9045b44e88dcdd2d98643d832fe7ffd03c7bebf1e1c7d853f06604a37a5144ef8ff55d735cbdd170661d6f8e43066109a125b3c43507ffdfd0610f0cdf331e
|
@@ -23,7 +23,6 @@ class Refine::Filters::Criterion
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def validate!
|
26
|
-
return if (input&.has_key?(:count_refinement) || input&.has_key?(:date_refinement))
|
27
26
|
errors.clear
|
28
27
|
return true if type == "conjunction"
|
29
28
|
begin
|
@@ -31,7 +30,7 @@ class Refine::Filters::Criterion
|
|
31
30
|
condition&.apply(input, filter.table, query_for_validate)
|
32
31
|
rescue Refine::Conditions::Errors::ConditionClauseError => e
|
33
32
|
e.errors.each do |error|
|
34
|
-
errors.add(:base, error.full_message)
|
33
|
+
errors.add(:base, :invalid, message: error.full_message)
|
35
34
|
end
|
36
35
|
end
|
37
36
|
end
|
@@ -1,14 +1,15 @@
|
|
1
1
|
class Refine::Inline::Criteria::DateRefinement
|
2
2
|
include ActiveModel::Model
|
3
3
|
|
4
|
-
attr_accessor :clause, :date1, :date2, :days
|
4
|
+
attr_accessor :clause, :date1, :date2, :days, :modifier
|
5
5
|
|
6
6
|
def attributes
|
7
7
|
{
|
8
8
|
clause: clause,
|
9
9
|
date1: date1,
|
10
10
|
date2: date2,
|
11
|
-
days: days
|
11
|
+
days: days,
|
12
|
+
modifier: modifier
|
12
13
|
}.compact
|
13
14
|
end
|
14
15
|
end
|
@@ -29,8 +29,8 @@ class Refine::Inline::Criteria::Input
|
|
29
29
|
value: value,
|
30
30
|
value1: value1,
|
31
31
|
value2: value2,
|
32
|
-
|
33
|
-
|
32
|
+
count_refinement: count_refinement_attributes.presence,
|
33
|
+
date_refinement: date_refinement_attributes.presence
|
34
34
|
}.compact
|
35
35
|
end
|
36
36
|
|
@@ -93,8 +93,7 @@ class Refine::Inline::Criterion
|
|
93
93
|
result = attributes.slice(:condition_id, :input_attributes)
|
94
94
|
result[:input] = result.delete(:input_attributes)
|
95
95
|
if input_attrs = result[:input]
|
96
|
-
|
97
|
-
input_attrs[:date_refinement] = input_attrs.delete(:date_refinement_attributes)
|
96
|
+
result[:input] = input_attrs
|
98
97
|
end
|
99
98
|
result
|
100
99
|
end
|
data/lib/refine/rails/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: refine-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.9.
|
4
|
+
version: 2.9.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Colleen Schnettler
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2024-
|
12
|
+
date: 2024-03-04 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|