wip #3506 @1

diff --git a/src/app/Magic/Fields/SelectFromArrayMultiple.php b/src/app/Magic/Fields/SelectFromArrayMultiple.php
index e861e19351faaa505ad14cf4cebfac3816e0f904..1f4b03d87b1fdecde014c557ff922d2d27c884eb 100644 (file)
--- a/src/app/Magic/Fields/SelectFromArrayMultiple.php
+++ b/src/app/Magic/Fields/SelectFromArrayMultiple.php
@@ -1,6 +1,4 @@
 <?php
-
-
 namespace Cubist\Backpack\app\Magic\Fields;
 
 

diff --git a/src/resources/views/fields/select2_from_array.blade.php b/src/resources/views/fields/select2_from_array.blade.php
index 54223bf846c6315e7ec89a3029878b91c09909ec..1692be20ba47f484de0774fac229c6e31471c318 100644 (file)
--- a/src/resources/views/fields/select2_from_array.blade.php
+++ b/src/resources/views/fields/select2_from_array.blade.php
@@ -1,5 +1,16 @@
 @php
+
     $o=$field['value'] ?? old(square_brackets_to_dots($field['name']));
+    $multiple=isset($field['allows_multiple']) && $field['allows_multiple'];
+
+    if($multiple){
+        if(is_string($o)){
+            $j=json_decode($o,true);
+            if(null!==$j){
+                $o=$j;
+            }
+        }
+    }
 
     $is_null=null===$o;
     if(!function_exists('select2_from_array_selected')){
@@ -22,10 +33,10 @@
 <div @include('crud::inc.field_wrapper_attributes') >
     <label>{!! $field['label'] !!}</label>
     <select
-        name="{{ $field['name'] }}@if (isset($field['allows_multiple']) && $field['allows_multiple']==true)[]@endif"
+        name="{{ $field['name'] }}@if ($multiple)[]@endif"
         style="width: 100%"
         @include('crud::inc.field_attributes', ['default_class' =>  'form-control select2_from_array'])
-        @if (isset($field['allows_multiple']) && $field['allows_multiple']==true)multiple @endif
+        @if ($multiple)multiple @endif
     >
 
         @if (isset($field['allows_null']) && $field['allows_null']==true)