wait #5756 @1.5

diff --git a/app/Console/Commands/WorkshopMigration.php b/app/Console/Commands/WorkshopMigration.php
index 2fea21273a006b70185d4d8df88eea3e09cc2ac8..c29a023035603eb953b6d5b4d9b9d12d5d8e136b 100644 (file)
--- 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 ef0700147e5499f450fe5e4888190228c7534724..f8f5ff62d0677be63edda8e6951deb3af3b8fb07 100644 (file)
--- 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' => '<i class="la la-language"></i>', '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' => '<i class="la la-language"></i>', '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' => '<i class="las la-chart-area" title="Compteur de visites du lien de préview"></i>']);
+        $this->addField('visits_counter', Integer::class, 'Compteur de visites', ['read_only' => true, 'default' => 0, 'column' => true, 'column_label' => '<i class="las la-chart-area" title="Compteur de visites du lien de préview"></i>', '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 4f262d6a975302207eedf8a9575709fc494a80e0..9c8bc659cf239aa578125e5a0dff54e2f37c63d7 100644 (file)
--- 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"}}',