wip #5127 @0.25

diff --git a/src/app/Magic/Fields/SelectFromArray.php b/src/app/Magic/Fields/SelectFromArray.php
index 9161da8702f8bd3ab0e13757256b6e65f586884a..a6a795ef805b261e1eb59d4d1c946ff6f2f013b8 100644 (file)
--- a/src/app/Magic/Fields/SelectFromArray.php
+++ b/src/app/Magic/Fields/SelectFromArray.php
@@ -40,12 +40,12 @@ class SelectFromArray extends Field
             $data = ['results' => $results, 'pagination' => ['more' => false]];
             $hash = hash('sha256', print_r($data, true));
             $name = $hash . '.json';
-            $dir = \Cubist\Util\Files\Files::mkdir(public_path('select2'));
+            $dir = \Cubist\Util\Files\Files::mkdir(storage_path('select2'));
             $file = $dir . '/' . $name;
             if (!file_exists($file)) {
                 file_put_contents($file, json_encode($data));
             }
-            $this->setAttribute('ajax', $name);
+            $this->setAttribute('ajax', $hash);
         }
     }
 

diff --git a/src/public/bunchmultiple/bunchmultiple.js b/src/public/bunchmultiple/bunchmultiple.js
index dd53a0133276f8efff8bf2547500812f0cbe18f0..621c1dade7f05192e9039657a79c980485e10570 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.js
+++ b/src/public/bunchmultiple/bunchmultiple.js
@@ -124,7 +124,6 @@
 
                     if (input.length === 0) {
                         input = form.find('[name="' + form.data('bmid') + '___' + varname + '"]');
-                        console.log(input);
                     }
                     var res = $(input).val();
 

diff --git a/src/resources/views/fields/select2_from_array.blade.php b/src/resources/views/fields/select2_from_array.blade.php
index 2f3eaa78d429315817ac1598027f0a8c3d24f097..f9232443815f3e8904c51a38b71f77bf36c88cf7 100644 (file)
--- a/src/resources/views/fields/select2_from_array.blade.php
+++ b/src/resources/views/fields/select2_from_array.blade.php
@@ -31,7 +31,7 @@
     style="width: 100%"
     @include('crud::fields.inc.attributes', ['default_class' =>  'form-control select2_from_array'])
     @if (isset($field['allows_multiple']) && $field['allows_multiple']==true)multiple @endif
-    @if(isset($field['ajax']) && $field['ajax']) data-ajax="{{$field['ajax']}}" @endif
+    @if($ajax) data-ajax="{{$field['ajax']}}" @endif
 >
     @if (isset($field['allows_null']) && $field['allows_null']==true)
         @if($is_null)
@@ -96,11 +96,16 @@
                         var options = {
                             theme: "bootstrap"
                         };
-                        if ($(this).is(['data-ajax'])) {
-                            options.ajax = {url: $(this).data('ajax'), dataType: 'json'};
+                        console.log($(this));
+                        if ($(this).is('[data-ajax]')) {
+                            options.ajax = {
+                                url: '{{backpack_url('select2')}}' +'/'+ $(this).data('ajax'),
+                                dataType: 'json'
+                            };
                         }
 
                         if (!$(obj).hasClass("select2-hidden-accessible")) {
+                            console.log(options);
                             $(obj).select2(options);
                         }
                     });