wip #4623

diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index b436996a5a134f69d5e9ad1647fcb9330996ee34..0a5dfc239ac3da5a3b0bdaace525667dbc2cca52 100644 (file)
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -240,9 +240,6 @@ class FluidbookTheme extends CubistMagicAbstractModel
             'default' => 100,
             'translatable' => false,
         ]);
-        $this->addField([
-            'type' => 'FormSeparator',
-        ]);
         $this->addField([
             'name' => 'usePageEdges',
             'type' => 'Checkbox',
@@ -250,10 +247,6 @@ class FluidbookTheme extends CubistMagicAbstractModel
             'default' => true,
             'translatable' => false,
         ]);
-
-        $this->addField([
-            'type' => 'FormSeparator',
-        ]);
         $this->addField([
             'name' => 'bookShadeColor',
             'type' => 'Color',

diff --git a/app/Models/FluidbookTranslate.php b/app/Models/FluidbookTranslate.php
index 849e52404053655c18bed606c2f795cba0f0950a..e3d8d3675522fab1a49910f5a5bcb408e16fa252 100644 (file)
--- a/app/Models/FluidbookTranslate.php
+++ b/app/Models/FluidbookTranslate.php
@@ -3,6 +3,7 @@
 
 namespace App\Models;
 
+use Cubist\Backpack\Facades\App;
 use Cubist\Backpack\Magic\Models\Translate;
 
 class FluidbookTranslate extends Translate
@@ -16,7 +17,7 @@ class FluidbookTranslate extends Translate
 
     public function __construct(array $attributes = [])
     {
-
+        $this->_availableLocales = \Cubist\Locale\Locale::getList(App::getLocale());
 
         parent::__construct($attributes);
     }

diff --git a/composer.lock b/composer.lock
index 8ebfb254d9fde0a91404ceb1254bad3ddacde2ab..a875980c140367e016b8e9dd5146e0acc6aa8704 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1318,13 +1318,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "fc4f6fbafd744a76128d7505d53011d376a128c4"
+                "reference": "d02ad168137e7b768e085cc117a07b3389c84037"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-32f4da.tar",
-                "reference": "fc4f6fbafd744a76128d7505d53011d376a128c4",
-                "shasum": "ab68a9d3a6545713f049fd30538afc91f85401d6"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-1be181.tar",
+                "reference": "d02ad168137e7b768e085cc117a07b3389c84037",
+                "shasum": "2f016ebe28957ef923117f497ab84a0665b79266"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -1399,7 +1399,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2021-07-27T08:28:21+00:00"
+            "time": "2021-07-27T10:28:53+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -4844,22 +4844,23 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.50.0",
+            "version": "2.51.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb"
+                "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
-                "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
+                "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": "^7.1.8 || ^8.0",
                 "symfony/polyfill-mbstring": "^1.0",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/translation": "^3.4 || ^4.0 || ^5.0"
             },
             "require-dev": {
@@ -4878,8 +4879,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev",
-                    "dev-3.x": "3.x-dev"
+                    "dev-3.x": "3.x-dev",
+                    "dev-master": "2.x-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -4933,7 +4934,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-28T22:38:45+00:00"
+            "time": "2021-07-28T13:16:28+00:00"
         },
         {
             "name": "neutron/temporary-filesystem",
@@ -12778,16 +12779,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
@@ -12816,7 +12817,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
             },
             "funding": [
                 {
@@ -12824,7 +12825,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-07-12T23:59:07+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         },
         {
             "name": "webmozart/assert",