wip #4795 @1

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 9f4d5aa428c1b7e53bc7dfce98112e280c807953..9e731f092ca0e517a805dc0332519b43652b8299 100644 (file)
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use Cubist\Backpack\Magic\Fields\Files;
 use Cubist\Backpack\Magic\Fields\SelectFromArray;
+use Cubist\Backpack\Magic\Fields\SelectFromModel;
 use Cubist\Backpack\Magic\Fields\Tags;
 use Cubist\Backpack\Magic\Fields\Text;
 use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
@@ -39,7 +40,7 @@ class Asset extends CubistMagicAbstractModel
                 'column' => true,
             ]);
         $this->addField('file_upload', Files::class, 'Fichier');
-        $this->addField('theme', 'SelectFromModel', 'Thème', ['optionsmodel' => AssetTheme::class]);
+        $this->addField('theme', SelectFromModel::class, 'Thème', ['optionsmodel' => AssetTheme::class, 'allows_null' => true, 'column' => true]);
         $this->addField('keywords', Tags::class, 'Mots-clé', ['column' => true]);
     }
 

diff --git a/app/Models/Publication.php b/app/Models/Publication.php
index 33af7c8ddb2d53e726cc11c1236bd3080cd4b341..8afdc0c63c99ab51b87bb7c2e88793ad7ea95604 100644 (file)
--- a/app/Models/Publication.php
+++ b/app/Models/Publication.php
@@ -26,7 +26,7 @@ class Publication extends CubistMagicAbstractModel
 
         $this->addField('document', Files::class, 'Document', ['tab' => 'Publication interactive']);
         $this->addField('precompiled', Files::class, 'Fluidbook Précompilé', ['can' => 'precompiled', 'tab' => 'Publication interactive']);
-        $this->addField('logo', Text::class, 'Logo', ['tab' => 'Contenus']);
+        $this->addField('logo', Images::class, 'Logo', ['tab' => 'Contenus']);
         $this->addField('subtitle', Text::class, 'Sous-titre', ['tab' => 'Contenus']);
         $this->addField('illustration', Images::class, 'Image', ['tab' => 'Contenus']);
         $this->addField('button', Text::class, 'Intitulé du bouton', ['tab' => 'Contenus']);

diff --git a/app/SubForms/ResourceMemo.php b/app/SubForms/ResourceMemo.php
index db278c38dc3968f74c918543439e73ffa64a5bad..8d511ed1092c2181ed459770f1ef6c087037ac9c 100644 (file)
--- a/app/SubForms/ResourceMemo.php
+++ b/app/SubForms/ResourceMemo.php
@@ -13,7 +13,6 @@ class ResourceMemo extends SubForm
         parent::init();
 
         $this->addField('memo_title', 'Text', 'Titre');
-        $this->addField('memo_text', 'Textarea', 'Chapo');
         $this->addField('memo_pdf', Files::class, 'PDF');
         $this->addField('memo_image', Images::class, 'Vignette');
     }

diff --git a/app/SubForms/ResourceSubChapter.php b/app/SubForms/ResourceSubChapter.php
index 88d748ad64e9c2d6aff5bdb1c1fe2ed76243709a..97c30d8e258c13258c9955acc02eaf28bc39323f 100644 (file)
--- a/app/SubForms/ResourceSubChapter.php
+++ b/app/SubForms/ResourceSubChapter.php
@@ -12,6 +12,7 @@ class ResourceSubChapter extends SubForm
         parent::init();
 
         $this->addField('subchapter_title', 'Text', 'Titre du sous-chapitre');
+        $this->addField('subchapter_subtitle', 'Textarea', 'Chapo du sous-chapitre');
         $this->addField('subchapter_memos', BunchOfFieldsMultiple::class, 'Mémos', ['bunch' => ResourceMemo::class, 'add_label' => 'Ajouter un mémo']);
 
     }