From 3f88879668ce1b142dbf4253aceaf101337cd016 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 6 Oct 2022 09:45:16 +0200
Subject: [PATCH] wait #5509 @0.25

---
 app/Models/FluidbookPublication.php       | 24 +++++++++++------------
 app/Models/Traits/PublicationSettings.php | 19 ++++++++++--------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index d8a9373c2..995dfacef 100644
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -53,15 +53,15 @@ class FluidbookPublication extends ToolboxSettingsModel
     {
         parent::setFields();
 
-        $this->addField([
-            'name' => 'name',
-            'type' => FluidbookTitle::class,
-            'label' => __('Titre de la publication'),
-            'default' => '',
-            'column' => true,
-            'translatable' => false,
-            'non_default_tracking' => false,
-        ]);
+//        $this->addField([
+//            'name' => 'name',
+//            'type' => FluidbookTitle::class,
+//            'label' => __('Titre de la publication'),
+//            'default' => '',
+//            'column' => true,
+//            'translatable' => false,
+//            'non_default_tracking' => false,
+//        ]);
 
         $this->addOwnerField();
 
@@ -81,7 +81,7 @@ class FluidbookPublication extends ToolboxSettingsModel
         $this->addField('composition', FluidbookComposition::class, __('Composition'));
 
         $this->addField('section_theme', FormBigSection::class, __('Thème graphique'));
-        $this->addField('theme', \App\Fields\FluidbookTheme::class, __('Thème'), ['non_default_tracking' => false,]);
+        $this->addField('theme', \App\Fields\FluidbookTheme::class, __('Thème'), ['non_default_tracking' => false, 'default' => 1161]);
 
         $this->addField('section_locale', FormBigSection::class, __('Langue'));
         $this->addField('locale', FluidbookLocale::class, __('Langue principale'), ['default' => 'fr', 'allows_null' => false, 'filter' => true, 'filter_label' => 'Langue', 'column' => true, 'column_label' => '<i class="la la-language"></i>', 'non_default_tracking' => false]);
@@ -126,14 +126,14 @@ class FluidbookPublication extends ToolboxSettingsModel
         }
     }
 
-    public function onSaving():bool
+    public function onSaving(): bool
     {
         $this->setComposedAttributes();
         $this->checkHash();
         return parent::onSaving();
     }
 
-    public function onSaved():bool
+    public function onSaved(): bool
     {
         $this->setComposedAttributes();
         $this->checkHash();
diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php
index f673732e5..5c9e7c5d7 100644
--- a/app/Models/Traits/PublicationSettings.php
+++ b/app/Models/Traits/PublicationSettings.php
@@ -26,6 +26,15 @@ trait PublicationSettings
         $acceptImages = ['.svg', '.jpg', '.jpeg', '.png', '.gif'];
 
         $this->addField('section_important', FormSection::class, $this->__('Description de la publication'));
+        $this->addField('title', LongText::class, $this->__('Titre de la publication'), [
+            'v2' => '{"type":"text","default":"","editable":true,"label":"\\u00a7!\\u00a7Titre de la publication!\\u00a7!","embed":false}',
+            'default' => '',
+            'fake' => true,
+            'store_in' => 'settings',
+            'translatable' => false,
+            'column' => true,
+            'column_move_after' => 'id',
+        ]);
         $this->addField('mobileLVersion', FluidbookDevelopmentVersion::class, $this->__('Version logicielle'), [
             'v2' => '{"type":"combo","default":"stable","editable":true,"label":"\\u00a7!\\u00a7Version logicielle!\\u00a7!","grade":1,"datas":{"master : git (stable)":"stable","master : local (dev)":"dev","icon-bar : git":"icon-bar|git","icon-bar : local":"icon-bar|local"}}',
             'default' => 'stable',
@@ -36,7 +45,7 @@ trait PublicationSettings
         $this->addField('mobileVersion', SelectFromArray::class, $this->__('Version mobile'), [
             'v2' => '{"type":"combo","default":"html5-desktop","editable":true,"label":"\\u00a7!\\u00a7Version mobile!\\u00a7!","grade":3,"datas":{"\\u00a7!\\u00a7Rediriger vers le PDF!\\u00a7!":"pdf","\\u00a7!\\u00a7Version HTML5 recommand\\u00e9e (vecteurs sur desktop)!\\u00a7!":"html5-desktop","\\u00a7!\\u00a7Version HTML5 vecteurs!\\u00a7!":"html5","\\u00a7!\\u00a7Version HTML5 en images!\\u00a7!":"html5-images"}}',
             'options' => [
-                'pdf' => $this->__('Rediriger vers le PDF'),
+                //'pdf' => $this->__('Rediriger vers le PDF'),
                 'html5-desktop' => $this->__('Version HTML5 recommandée (vecteurs sur desktop)'),
                 'html5' => $this->__('Version HTML5 vecteurs'),
                 'html5-images' => $this->__('Version HTML5 en images'),
@@ -46,13 +55,7 @@ trait PublicationSettings
             'store_in' => 'settings',
             'translatable' => false,
         ]);
-        $this->addField('title', LongText::class, $this->__('Titre de la publication'), [
-            'v2' => '{"type":"text","default":"","editable":true,"label":"\\u00a7!\\u00a7Titre de la publication!\\u00a7!","embed":false}',
-            'default' => '',
-            'fake' => true,
-            'store_in' => 'settings',
-            'translatable' => false,
-        ]);
+
         $this->addField('url_link', LongText::class, $this->__('URL du lien de retour au site'), [
             'v2' => '{"type":"text","default":"http:\\/\\/","editable":true,"label":"\\u00a7!\\u00a7URL du lien de retour au site!\\u00a7!"}',
             'default' => 'http://',
-- 
2.39.5