wait #5401 @0.25

diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php
index e9d501964522c074e297852cafc0547ea9cddbdb..d6435de2030f1e2ca19f2d4a80eaed81b942e65e 100644 (file)
--- a/src/app/Magic/Fields/Field.php
+++ b/src/app/Magic/Fields/Field.php
@@ -306,8 +306,16 @@ class Field implements \ArrayAccess
         if ($type === 'simple') {
             $crud->addClause('where', $name, '1');
         } else if ($type === 'dropdown' || $type === 'select2') {
-            $crud->addClause('where', $name, $value);
-        } else if ($type === 'select2_multiple') {
+            if ($this->getAttribute('allows_multiple')) {
+                if(is_array($value)){
+                    $value=json_encode($value);
+                }
+                $crud->addClause('where', $name, 'isnotnull');
+                $crud->addClause('where', $name, 'like', '%"' . $value . '"%');
+            } else {
+                $crud->addClause('where', $name, $value);
+            }
+        } else if ($type === 'select2_multiple' || $type === 'checkbox_multiple') {
             $crud->addClause('whereIn', $name, json_decode($value));
         } else if ($type === 'date_range') {
             $dates = json_decode($value);

diff --git a/src/resources/views/fields/checkbox_multiple.blade.php b/src/resources/views/fields/checkbox_multiple.blade.php
index 8298c96df7abc6f004002d82e66e21af84f995b1..006049d0b6adbe3b152629c4e4559e80372524f8 100644 (file)
--- a/src/resources/views/fields/checkbox_multiple.blade.php
+++ b/src/resources/views/fields/checkbox_multiple.blade.php
@@ -20,6 +20,7 @@
     <!-- select2 from array -->
 @include('crud::fields.inc.wrapper_start')
 <label>{!! $field['label'] !!}</label>
+<input type="hidden" value="" name="{{$field['name']}}" />
 <ul class="checkbox-multiple">
     @if (count($field['options']))
         @foreach ($field['options'] as $key => $data)