Skip to content

Commit 20da2ec

Browse files
committed
Use a class rather than OpenStruct for DateRange
1 parent 67ef51d commit 20da2ec

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
# frozen_string_literal: true
22

3-
require 'ostruct'
4-
53
module AjaxDatatablesRails
64
module Datatable
75
class Column
86
module DateFilter
97

8+
class DateRange
9+
attr_reader :begin, :end
10+
11+
def initialize(date_start, date_end)
12+
@begin = date_start
13+
@end = date_end
14+
end
15+
16+
def exclude_end?
17+
false
18+
end
19+
end
20+
1021
# Add delimiter option to handle range search
1122
def delimiter
1223
@view_column[:delimiter] || '-'
@@ -31,7 +42,7 @@ def range_end
3142
# Do a range search
3243
def date_range_search
3344
return nil if empty_range_search?
34-
table[field].between(OpenStruct.new(begin: range_start_casted, end: range_end_casted))
45+
table[field].between(DateRange.new(range_start_casted, range_end_casted))
3546
end
3647

3748
private

0 commit comments

Comments
 (0)