From c504593a4539a12f851e626eab22873e25c2abdf Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 24 Feb 2023 17:54:10 +0100 Subject: [PATCH] wait #5756 @1.5 --- app/Console/Commands/WorkshopMigration.php | 10 +++++++--- app/Models/FluidbookPublication.php | 19 ++++++++++++++----- app/Models/Traits/PublicationSettings.php | 2 -- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/Console/Commands/WorkshopMigration.php b/app/Console/Commands/WorkshopMigration.php index 2fea21273..c29a02303 100644 --- a/app/Console/Commands/WorkshopMigration.php +++ b/app/Console/Commands/WorkshopMigration.php @@ -204,6 +204,9 @@ class WorkshopMigration extends CubistCommand if (!$c->hasField($new)) { continue; } + if ($new == 'visits_counter' && $v == 20) { + $v = 0; + } if ($c->getField($new) instanceof Datetime) { $date = new \DateTime(); $date->setTimestamp($v); @@ -235,10 +238,11 @@ class WorkshopMigration extends CubistCommand if (isset($mapValues[$data])) { $data = $mapValues[$data]; } - if ($k === 'visits_counter' && $data == 20) { - $data = 0; - } + $c->setAttribute($k, $data); + if ($k === 'title') { + $c->setAttribute('c_title', $data); + } } // Composition diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index ef0700147..f8f5ff62d 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -79,6 +79,7 @@ class FluidbookPublication extends ToolboxSettingsModel 'non_default_tracking' => false, 'allows_null' => false, 'default' => -1, + 'searchLogic' => false, ] ); @@ -90,7 +91,8 @@ class FluidbookPublication extends ToolboxSettingsModel $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' => '', 'non_default_tracking' => false]); + $this->addField('locale', FluidbookLocale::class, __('Langue principale'), + ['default' => 'fr', 'allows_null' => false, 'filter' => true, 'filter_label' => 'Langue', 'column' => true, 'column_label' => '', 'non_default_tracking' => false, 'searchLogic' => false]); $this->addField('translations', \App\Fields\FluidbookTranslationOverwrite::class, __('Traductions personnalisées')); $this->addField('section_chapters', FormBigSection::class, __('Sommaire')); @@ -103,10 +105,10 @@ class FluidbookPublication extends ToolboxSettingsModel $this->addField('section_infos', FormBigSection::class, __('Administration')); - $this->addField('visits_counter', Integer::class, 'Compteur de visites', ['read_only' => true, 'default' => 0, 'column' => true, 'column_label' => '']); + $this->addField('visits_counter', Integer::class, 'Compteur de visites', ['read_only' => true, 'default' => 0, 'column' => true, 'column_label' => '', 'searchLogic' => false]); - $this->addField(self::CREATED_AT, Datetime::class, __('Crée'), ['column' => true, 'column_type' => 'datetime', 'column_format' => 'YYYY-MM-DD', 'filter' => true, 'read_only' => true]); - $this->addField(self::UPDATED_AT, Datetime::class, __('Mis à jour'), ['column' => true, 'column_format' => 'YYYY-MM-DD', 'filter' => true, 'read_only' => true]); + $this->addField(self::CREATED_AT, Datetime::class, __('Crée'), ['column' => true, 'column_type' => 'datetime', 'column_format' => 'YYYY-MM-DD', 'filter' => true, 'read_only' => true, 'searchLogic' => false]); + $this->addField(self::UPDATED_AT, Datetime::class, __('Mis à jour'), ['column' => true, 'column_format' => 'YYYY-MM-DD', 'filter' => true, 'read_only' => true, 'searchLogic' => false]); $this->addField('compilation_date', Datetime::class, __('Dernière compilation'), ['read_only' => true]); $this->addField('composition_updated_at', Datetime::class, __('Dernière modification de la composition'), ['read_only' => true]); $this->addField('status_date', Datetime::class, __('Date de changement de status'), ['read_only' => true]); @@ -132,7 +134,13 @@ class FluidbookPublication extends ToolboxSettingsModel 'owner_name' => __('Propriétaire'), 'invoicable' => __('Utilisateur facturable'), 'invoicable_company' => __('Facturation'), - 'extranet_project' => __('Project extranet') + 'extranet_project' => __('Project extranet'), + 'c_title' => [ + 'label' => __('Titre'), + 'read_only' => true, + 'column' => true, + 'column_move_after' => 'id', + ] ]; foreach ($composed as $name => $label) { @@ -196,6 +204,7 @@ class FluidbookPublication extends ToolboxSettingsModel $this->invoicable = ''; $this->invoicable_company = ''; $this->extranet_project = ''; + $this->c_title = $this->title; } public function __($str) diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php index 4f262d6a9..9c8bc659c 100644 --- a/app/Models/Traits/PublicationSettings.php +++ b/app/Models/Traits/PublicationSettings.php @@ -59,8 +59,6 @@ trait PublicationSettings '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"}}', -- 2.39.5