Treat true/false as YES/NO when assigned as strings

bogdan · Jul 5, 2024 · ab972f2 · ab972f2
1 parent 6ac8c19
commit ab972f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## master
 
+* Treat true/false as YES/NO when assigned as strings for xboolean filter
 * Support infinite ranges for date, datetime and integer filters
 
 ## 1.8.1

diff --git a/lib/datagrid/filters/extended_boolean_filter.rb b/lib/datagrid/filters/extended_boolean_filter.rb
@@ -3,6 +3,8 @@ class Datagrid::Filters::ExtendedBooleanFilter < Datagrid::Filters::EnumFilter
 
   YES = "YES"
   NO = "NO"
+  TRUTH_VALUES = [true, 'true', "y", "yes"]
+  FALSE_VALUES = [false, 'false', "n", "no"]
 
   def initialize(report, attribute, options = {}, &block)
     options[:select] = -> { boolean_select }
@@ -15,10 +17,11 @@ def execute(value, scope, grid_object)
   end
 
   def parse(value)
-    case
-    when value == true
+    value = value.downcase if value.is_a?(String)
+    case value
+    when *TRUTH_VALUES
       YES
-    when value == false
+    when *FALSE_VALUES
       NO
     when value.blank?
       nil

diff --git a/spec/datagrid/filters/extended_boolean_filter_spec.rb b/spec/datagrid/filters/extended_boolean_filter_spec.rb
@@ -41,6 +41,10 @@
     expect(grid.disabled).to eq("YES")
     grid.disabled = false
     expect(grid.disabled).to eq("NO")
+    grid.disabled = "true"
+    expect(grid.disabled).to eq("YES")
+    grid.disabled = "false"
+    expect(grid.disabled).to eq("NO")
   end
 
 end