Skip to content

Commit 3285ee4

Browse files
authored
Merge pull request #1 from gauda/gauda-date-fix
catch errors when the date string is not in correct format
2 parents 77d5185 + 8097f97 commit 3285ee4

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

lib/ajax-datatables-rails/datatable/column/date_filter.rb

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,27 @@ def date_range_search
5050
private
5151

5252
def range_start_casted
53-
range_start.blank? ? parse_date('01/01/1970') : parse_date(range_start)
53+
if range_start.blank?
54+
parse_date('01/01/1970')
55+
else
56+
begin
57+
parse_date(range_start)
58+
rescue ArgumentError
59+
parse_date('01/01/1970')
60+
end
61+
end
5462
end
5563

5664
def range_end_casted
57-
range_end.blank? ? Time.current : parse_date("#{range_end} 23:59:59")
65+
if range_end.blank?
66+
Time.current
67+
else
68+
begin
69+
parse_date("#{range_end} 23:59:59")
70+
rescue ArgumentError
71+
Time.current
72+
end
73+
end
5874
end
5975

6076
def parse_date(date)

0 commit comments

Comments
 (0)