Skip to content

Commit c6ab5ae

Browse files
committed
Remove deprecated eboolean filter. Use xboolean instead.
1 parent 54bf44c commit c6ab5ae

File tree

6 files changed

+5
-34
lines changed

6 files changed

+5
-34
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## master
22

3+
* Remove deprecated `eboolean` filter
34
* Fixed scope wrapping to be universal
45
* Deprecated `integer_range_filters` and `date_range_filters`. Use `filter(name, type, range: true)` instead.
56
* Add `original_scope` method that returns scope as it was defined without any wrapping [#313](https://github.com/bogdan/datagrid/pull/313)

lib/datagrid/filters.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module Filters
55

66
require "datagrid/filters/base_filter"
77
require "datagrid/filters/enum_filter"
8-
require "datagrid/filters/boolean_enum_filter"
98
require "datagrid/filters/extended_boolean_filter"
109
require "datagrid/filters/boolean_filter"
1110
require "datagrid/filters/date_filter"
@@ -22,7 +21,6 @@ module Filters
2221
datetime: Filters::DateTimeFilter,
2322
string: Filters::StringFilter,
2423
default: Filters::DefaultFilter,
25-
eboolean: Filters::BooleanEnumFilter ,
2624
xboolean: Filters::ExtendedBooleanFilter ,
2725
boolean: Filters::BooleanFilter ,
2826
integer: Filters::IntegerFilter,

lib/datagrid/filters/boolean_enum_filter.rb

Lines changed: 0 additions & 19 deletions
This file was deleted.

lib/datagrid/form_builder.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ def datagrid_label(filter_or_attribute, text = nil, **options, &block)
2929
end
3030

3131
protected
32-
def datagrid_boolean_enum_filter(attribute_or_filter, options = {})
33-
datagrid_enum_filter(attribute_or_filter, options)
34-
end
35-
3632
def datagrid_extended_boolean_filter(attribute_or_filter, options = {})
3733
datagrid_enum_filter(attribute_or_filter, options)
3834
end

lib/datagrid/rspec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
describe "filter ##{filter.name}" do
3333

3434
let(:filter_value) do
35-
35+
3636
case Datagrid::Filters::FILTER_TYPES.invert[filter.class]
3737
when :default, :string
3838
"text"
3939
when :date
4040
1.day.ago
41-
when :xboolean, :eboolean
42-
Datagrid::Filters::BooleanEnumFilter::YES
41+
when :xboolean
42+
Datagrid::Filters::ExtendedBooleanFilter::YES
4343
when :boolean
4444
true
4545
when :integer
@@ -58,7 +58,7 @@
5858
end
5959

6060
it "should be supported" do
61-
subject.assets.should_not be_nil
61+
subject.assets.should_not be_nil
6262
#TODO: better matcher.
6363
end
6464
end

spec/datagrid/filters/boolean_enum_filter_spec.rb

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)