wait #5401 @1

diff --git a/src/app/Magic/Fields/Checkbox.php b/src/app/Magic/Fields/Checkbox.php
index a4a1b553e42ecfafb321721d4dea61de41cb379e..64b30fc40c67dbc7b2e30ada9e0b9afef1e3f092 100644 (file)
--- 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 d6435de2030f1e2ca19f2d4a80eaed81b942e65e..cb49bec319f18de9fb2ea21401cd25d765613c47 100644 (file)
--- 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);