From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 5 Oct 2021 11:54:16 +0000 (+0200)
Subject: wip #4666
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=199ce7beef27d2a999d5dc84d37f217df32631ba;p=odl.git

wip #4666
---

diff --git a/app/Models/Publication.php b/app/Models/Publication.php
index 08af4bc..4904dfc 100644
--- a/app/Models/Publication.php
+++ b/app/Models/Publication.php
@@ -32,12 +32,12 @@ class Publication extends CubistMagicAbstractModel
     /**
      * @param $controller CubistMagicController
      */
-    public function setupSaveActions($controller,$type)
+    public function setupSaveActions($controller, $type)
     {
-        $controller->crud->removeSaveAction('save_and_back');
-        $controller->crud->removeSaveAction('save_and_new');
+        $controller->crud->removeSaveAction('save_and_edit');
         $controller->crud->addSaveAction([
-            'name' => 'Enregistrer et compiler',
+            'name' => 'save_and_compile',
+            'button_text' => 'Enregistrer et compiler',
             'visible' => function ($crud) {
                 return true;
             },
@@ -45,6 +45,7 @@ class Publication extends CubistMagicAbstractModel
                 return backpack_url('tools/fluidbookconvert');
             },
         ]);
+        $controller->crud->orderSaveAction('save_and_compile', 1);
     }
 
     public function setup()
diff --git a/composer.lock b/composer.lock
index 0bec981..d7f1a01 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1218,13 +1218,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "fe936e16603a87099e96cd3cb8c8855883031c72"
+                "reference": "6eec26598ffb2fd86cbdfc53f68143fdb6f96481"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-2a2301.tar",
-                "reference": "fe936e16603a87099e96cd3cb8c8855883031c72",
-                "shasum": "4208b0a1258bc18538fe6e1370e21ed9455a1e5b"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-ca29db.tar",
+                "reference": "6eec26598ffb2fd86cbdfc53f68143fdb6f96481",
+                "shasum": "0c06b8fd31014895a863218a281c4294d994a9d7"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1249,7 +1249,7 @@
                 "fideloper/proxy": "^4.4",
                 "genealabs/laravel-model-caching": "^0.11",
                 "graham-campbell/markdown": "^v13.1",
-                "laravel/framework": "^v8.61",
+                "laravel/framework": "^v8.62",
                 "lavary/laravel-menu": "^v1.8",
                 "league/commonmark": "^1.6",
                 "predis/predis": "^v1.1",
@@ -1301,7 +1301,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2021-09-23T15:59:03+00:00"
+            "time": "2021-10-05T10:03:58+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -1556,13 +1556,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "e9de526eab75fd4ff218477966dbf813de96f42d"
+                "reference": "48a6ea4ac6babe7a093d6f93ee3b1ed20dbe5552"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-0baaf3.tar",
-                "reference": "e9de526eab75fd4ff218477966dbf813de96f42d",
-                "shasum": "a4c3fe9505d0ad0363914bf2e2dc0cb90896485c"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-fb06d8.tar",
+                "reference": "48a6ea4ac6babe7a093d6f93ee3b1ed20dbe5552",
+                "shasum": "995e5f6b44092ba13cfd550db170932a08dc75d9"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -1592,7 +1592,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2021-09-23T17:51:05+00:00"
+            "time": "2021-10-04T17:06:17+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
@@ -2735,13 +2735,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "f211243f3d3b35594a0b4092ba31f768e056f36b"
+                "reference": "e5ce3b29f54c211d45ce244c435fc77364092139"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-62621d.tar",
-                "reference": "f211243f3d3b35594a0b4092ba31f768e056f36b",
-                "shasum": "d7bfd978a18c393e7fa1b453dd0f4eea5a006b5f"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-2b8598.tar",
+                "reference": "e5ce3b29f54c211d45ce244c435fc77364092139",
+                "shasum": "61de369f6bfff0a1546a7c2b6d88b960fc1ce076"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "^3.6",
@@ -2773,7 +2773,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2021-09-23T17:50:36+00:00"
+            "time": "2021-10-04T17:03:56+00:00"
         },
         {
             "name": "fruitcake/laravel-cors",
@@ -3351,16 +3351,16 @@
         },
         {
             "name": "intervention/image",
-            "version": "2.6.1",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45"
+                "reference": "9a8cc99d30415ec0b3f7649e1647d03a55698545"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/0925f10b259679b5d8ca58f3a2add9255ffcda45",
-                "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/9a8cc99d30415ec0b3f7649e1647d03a55698545",
+                "reference": "9a8cc99d30415ec0b3f7649e1647d03a55698545",
                 "shasum": ""
             },
             "require": {
@@ -3419,7 +3419,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/2.6.1"
+                "source": "https://github.com/Intervention/image/tree/2.7.0"
             },
             "funding": [
                 {
@@ -3431,7 +3431,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-22T14:31:53+00:00"
+            "time": "2021-10-03T14:17:12+00:00"
         },
         {
             "name": "laravel/framework",