wip #5383 @1

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 7caf172017c552d161a0a001ca4bcd150c8638d4..4f87fa0d29eb6e145f0ae03003ac4d12ecc9aafa 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -637,6 +637,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             }
             $res[$k] = $attribute;
         }
+
         return $res;
     }
 

diff --git a/src/public/bunchmultiple/bunchmultiple.js b/src/public/bunchmultiple/bunchmultiple.js
index d9f31525b44003d32fec635e601681a8b2f265d9..0ba286922612dba2920d7fe2e3700655a69954c6 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.js
+++ b/src/public/bunchmultiple/bunchmultiple.js
@@ -162,7 +162,11 @@
                 });
                 val = kvval;
             }
-            this.element.find('.hiddenfield' + this.bmidselector).val(JSON.stringify(val));
+            var hidden=this.element.find('.hiddenfield' + this.bmidselector);
+            if ($(hidden).attr('name').indexOf('chapters') >= 0) {
+                var jsonval = JSON.stringify(val);
+                $(hidden).val(jsonval);
+            }
         },
 
         updateLegends: function () {
@@ -305,7 +309,7 @@
                         cb.prop('checked', v === true || v === '1' || v === 1);
                     } else if ($(input).is('.select2_from_array')) {
                         try {
-                            if ($(input).is('[data-ajax]') && $(input).find('option[value="' + k + '"]').length === 0) {
+                            if ($(input).is("[data-ajax]") && $(input).find('option[value="' + k + '"]').length === 0) {
                                 var options = $(input).data('options');
                                 var newOption = new Option(options[v], v, false, false);
                                 $(input).append(newOption).trigger('change');

diff --git a/src/resources/views/fields/bunch_keyvalue_multiple.blade.php b/src/resources/views/fields/bunch_keyvalue_multiple.blade.php
index 2258c9877e7aeb9c2baab28ca5577aeae4aa4ce9..10e90755c0d1234e73f9a60262c384a81ea87935 100644 (file)
--- a/src/resources/views/fields/bunch_keyvalue_multiple.blade.php
+++ b/src/resources/views/fields/bunch_keyvalue_multiple.blade.php
@@ -1,6 +1,4 @@
-<!-- Bunch -->
-
-<?php
+@php
 $empty = [];
 $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? $empty;
 if ($value == '') {
@@ -23,7 +21,7 @@ if (!is_string($value)) {
     $value = json_encode($value);
 }
 
-?>
+@endphp
 <div class="bunchmultiple bunchmultiple_keyvalue{{ ($field['show_empty']?' showEmpty':'') }}"
      id="{!! $field['rand'] !!}" data-bunch-name="{{$field['name']}}" data-values="{{ $value }}">
     <input type="hidden" class="hiddenfield" name="{{$field['name']}}" value="{{ $value }}"

diff --git a/src/resources/views/fields/bunch_multiple.blade.php b/src/resources/views/fields/bunch_multiple.blade.php
index 9bc3d099f2bc512b3f936af81f8cdc63c7afd1e9..4f901cd5845a94f00923c6fa588fec63fba4e7dd 100644 (file)
--- a/src/resources/views/fields/bunch_multiple.blade.php
+++ b/src/resources/views/fields/bunch_multiple.blade.php
@@ -1,6 +1,4 @@
-<!-- Bunch -->
-
-<?php
+@php
 $empty = [];
 $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? $empty;
 if ($value == '') {
@@ -11,7 +9,7 @@ if (!is_string($value)) {
     $value = json_encode($value);
 }
 
-?>
+@endphp
 <div class="bunchmultiple{{ ($field['show_empty']?' showEmpty':'') }}" id="{!! $field['rand'] !!}" data-bunch-name="{{$field['name']}}" data-values="{{ $value }}">
     <input type="hidden" class="hiddenfield" name="{{$field['name']}}" value="{{ $value }}" data-bmid="{!! $field['rand'] !!}"/>
     <div class="bunchmultiple__wrapper" data-bmid="{!! $field['rand'] !!}">

diff --git a/src/resources/views/fields/bunch_oneline_multiple.blade.php b/src/resources/views/fields/bunch_oneline_multiple.blade.php
index 4e0906d144d2a7f6192a559b7a03f9a8f3e0f202..1f265c135bfa1f631335befb117922605190f45b 100644 (file)
--- a/src/resources/views/fields/bunch_oneline_multiple.blade.php
+++ b/src/resources/views/fields/bunch_oneline_multiple.blade.php
@@ -1,29 +1,27 @@
-<!-- Bunch -->
-
-<?php
-$empty = [];
-$value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? $empty;
-if ($value == '') {
-    $value = $empty;
-}
+@php
+    $empty = [];
+    $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? $empty;
+    if ($value == '') {
+        $value = $empty;
+    }
 
-if (is_array($value)) {
-    $normalizedValue = [];
-    foreach ($value as $k => $v) {
-        if (!is_array($v) && !is_object($v)) {
-            $normalizedValue[] = ['key' => $k, 'value' => $v];
-        } else {
-            $normalizedValue[$k] = $v;
+    if (is_array($value)) {
+        $normalizedValue = [];
+        foreach ($value as $k => $v) {
+            if (!is_array($v) && !is_object($v)) {
+                $normalizedValue[] = ['key' => $k, 'value' => $v];
+            } else {
+                $normalizedValue[$k] = $v;
+            }
         }
+        $value = $normalizedValue;
     }
-    $value = $normalizedValue;
-}
 
-if (!is_string($value)) {
-    $value = json_encode($value);
-}
+    if (!is_string($value)) {
+        $value = json_encode($value);
+    }
 
-?>
+@endphp
 <div class="bunchmultiple bunchmultiple_oneline{{ ($field['show_empty']?' showEmpty':'') }}"
      id="{!! $field['rand'] !!}" data-bunch-name="{{$field['name']}}" data-values="{{ $value }}">
     <input type="hidden" class="hiddenfield" name="{{$field['name']}}" value="{{ $value }}"