Skip to content

Commit bfd245a

Browse files
committed
Now that Rails 4.0 support is dropped we can replace prepend by include
1 parent 5e3ac4d commit bfd245a

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Column
1818

1919
include Search
2020
include Order
21-
prepend DateFilter
21+
include DateFilter
2222

2323

2424
def initialize(datatable, index, options)

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ def date_range_search
4747

4848
private
4949

50-
def non_regex_search
51-
if cond == :date_range
52-
date_range_search
53-
else
54-
super
55-
end
56-
end
57-
5850
def range_start_casted
5951
range_start.blank? ? parse_date('01/01/1970') : parse_date(range_start)
6052
end

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ def non_regex_search
6868
casted_column.matches("%#{formatted_value}%")
6969
when :string_eq
7070
raw_search(:eq)
71+
when :date_range
72+
date_range_search
7173
end
7274
end
7375

0 commit comments

Comments
 (0)