From 16a813fcf5713137eb01146b6bc12c02bcc9f4b4 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 18 Jul 2023 14:43:50 +0200 Subject: [PATCH] wait #5401 @1 --- src/app/Magic/Fields/Checkbox.php | 8 +++++++- src/app/Magic/Fields/Field.php | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/Magic/Fields/Checkbox.php b/src/app/Magic/Fields/Checkbox.php index a4a1b55..64b30fc 100644 --- a/src/app/Magic/Fields/Checkbox.php +++ b/src/app/Magic/Fields/Checkbox.php @@ -11,11 +11,17 @@ class Checkbox extends Field protected $_columnType = 'check'; protected $_cast = 'boolean'; protected $_viewNamespace = 'toggle-field-for-backpack::fields'; - protected $_filterType = 'simple'; + protected $_filterType = 'dropdown'; public function filterDefault($value) { return $value ? '1' : '0'; } + public function getFilterValues() + { + return ['1' => __('Oui'), '0' => __('Non')]; + } + + } diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php index d6435de..cb49bec 100644 --- a/src/app/Magic/Fields/Field.php +++ b/src/app/Magic/Fields/Field.php @@ -307,10 +307,10 @@ class Field implements \ArrayAccess $crud->addClause('where', $name, '1'); } else if ($type === 'dropdown' || $type === 'select2') { if ($this->getAttribute('allows_multiple')) { - if(is_array($value)){ - $value=json_encode($value); + if (is_array($value)) { + $value = json_encode($value); } - $crud->addClause('where', $name, 'isnotnull'); + $crud->addClause('whereNotNull', $name); $crud->addClause('where', $name, 'like', '%"' . $value . '"%'); } else { $crud->addClause('where', $name, $value); -- 2.39.5