File tree 1 file changed +8
-10
lines changed
lib/ajax-datatables-rails/datatable/column
1 file changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -5,6 +5,8 @@ module Datatable
5
5
class Column
6
6
module DateFilter
7
7
8
+ RANGE_DELIMITER = '-'
9
+
8
10
class DateRange
9
11
attr_reader :begin , :end
10
12
@@ -20,11 +22,7 @@ def exclude_end?
20
22
21
23
# Add delimiter option to handle range search
22
24
def delimiter
23
- @view_column [ :delimiter ] || '-'
24
- end
25
-
26
- def empty_range_search?
27
- ( formatted_value == delimiter ) || ( range_start . blank? && range_end . blank? )
25
+ @delimiter ||= @view_column . fetch ( :delimiter , RANGE_DELIMITER )
28
26
end
29
27
30
28
# A range value is in form '<range_start><delimiter><range_end>'
@@ -39,6 +37,10 @@ def range_end
39
37
@range_end ||= formatted_value . split ( delimiter ) [ 1 ]
40
38
end
41
39
40
+ def empty_range_search?
41
+ ( formatted_value == delimiter ) || ( range_start . blank? && range_end . blank? )
42
+ end
43
+
42
44
# Do a range search
43
45
def date_range_search
44
46
return nil if empty_range_search?
@@ -56,11 +58,7 @@ def range_end_casted
56
58
end
57
59
58
60
def parse_date ( date )
59
- if Time . zone
60
- Time . zone . parse ( date )
61
- else
62
- Time . parse ( date )
63
- end
61
+ Time . zone ? Time . zone . parse ( date ) : Time . parse ( date )
64
62
end
65
63
66
64
end
You can’t perform that action at this time.
0 commit comments