tabulatr2 0.9.17 → 0.9.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/tabulatr/data/filtering.rb +2 -2
- data/lib/tabulatr/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6473367916ab2e6e08fa0c12d6ad52c8a4d46133
|
|
4
|
+
data.tar.gz: b07f60664c8256ed0f407a14488ebb3169cc549e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 524a2b9d439a6a6ac6d86fe332ddd02ca84eef9d52ef4f39f326ec61019b4d804560c0cd62475107e58f2c61f1041f5410dfd733af25d96e63c1da9913fbb85c
|
|
7
|
+
data.tar.gz: 6564584c80a000705359a4f8cbdcdfdcbe0a2137fe79fc6af97ec706755d5d716c716f9a930611e8a7a3872ff02257f8e778605d68f82b233ff39693a650e82c
|
|
@@ -107,8 +107,8 @@ module Tabulatr::Data::Filtering
|
|
|
107
107
|
since = (today - 29.day).beginning_of_day
|
|
108
108
|
to = today.at_end_of_day
|
|
109
109
|
when 'from_to'
|
|
110
|
-
since = Date.parse(cond[:from]) if cond[:from].present?
|
|
111
|
-
to = Date.parse(cond[:to]) if cond[:to].present?
|
|
110
|
+
since = (Date.parse(cond[:from]) rescue nil) if cond[:from].present?
|
|
111
|
+
to = (Date.parse(cond[:to]) rescue nil) if cond[:to].present?
|
|
112
112
|
end
|
|
113
113
|
@relation = @relation.where("#{n.filter_sql} >= ?", since) if since.present?
|
|
114
114
|
@relation = @relation.where("#{n.filter_sql} <= ?", to) if to.present?
|
data/lib/tabulatr/version.rb
CHANGED