#2904

diff --git a/composer.json b/composer.json
index ba5817ef98afac5134b6d9edb19442b974360baa..2afa55ed22bf7f04596994ac8049b8960a0ea860 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "cubist\/cms-back",
+    "name": "cubist/cms-back",
     "description": "Cubist Backpack extension",
     "type": "library",
     "license": "proprietary",

diff --git a/src/app/Magic/PageData.php b/src/app/Magic/PageData.php
index 57b8d0aae3d9a49a668ae4bb53a9c541d7d40a6a..9b3579b73def990b00b1156a993923ec6a8d8309 100644 (file)
--- a/src/app/Magic/PageData.php
+++ b/src/app/Magic/PageData.php
@@ -47,7 +47,26 @@ class PageData implements \ArrayAccess
      */
     public function set($offset, $value)
     {
-        Arr::set($this->_data, $offset, $value);
+        $offset = square_brackets_to_dots($offset);
+        Arr::set($this->_data, $offset, $this->_fixValue($value));
+    }
+
+    protected function _fixValue($value)
+    {
+        if (!is_array($value)) {
+            return $value;
+        }
+        return $this->_fixArray($value);
+    }
+
+    protected function _fixArray($value)
+    {
+        $dot = Arr::dot($value);
+        $res = [];
+        foreach ($dot as $k => $v) {
+            Arr::set($res, square_brackets_to_dots($k), $v);
+        }
+        return $res;
     }
 
     /**

diff --git a/src/public/bunchmultiple/bunchmultiple.js b/src/public/bunchmultiple/bunchmultiple.js
index 3362fbfd99e0dabdc97f61755afbb314e847337c..85d7fd5479f7020b3874a772bbee9a97abdb8244 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.js
+++ b/src/public/bunchmultiple/bunchmultiple.js
@@ -112,7 +112,7 @@
 
         removeItem: function (item) {
             $(item).remove();
-            if (this.element.find('.item:not(.sample)').length == 0) {
+            if (this.element.find('.item:not(.sample)').length === 0) {
                 this.initItem();
             }
             this.update();
@@ -152,7 +152,7 @@
                     }
                 });
             }catch (e) {
-                
+
             }
             this.updateLegends();
         },

diff --git a/src/resources/views/fields/button.blade.php b/src/resources/views/fields/button.blade.php
index 1e254045dcc3d4075693b72c455b2174bf94546f..2f069e706bfdd97a3c7647e859e0c8cc6213f879 100644 (file)
--- a/src/resources/views/fields/button.blade.php
+++ b/src/resources/views/fields/button.blade.php
@@ -6,7 +6,7 @@ $field['allows_null'] = false;
 $page_model = $field['page_model'];
 $active_pages = \Cubist\Backpack\app\Magic\Models\CMSPage::getPagesList();
 
-$empty = ['label' => '', 'type' => 'page_link', 'link' => '', 'external_link' => '', 'page_id' => ''];
+$empty = ['label' => '', 'type' => 'none', 'link' => '', 'external_link' => '', 'page_id' => ''];
 $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? [];
 if ($value == '') {
     $value = [];