wait #6011 @0:10

diff --git a/app/Models/FluidbookCollection.php b/app/Models/FluidbookCollection.php
index f4507a48660c3f319d64020815a091a544e78806..b5580cb4c547317201e0f3756b76dcbad4430313 100644 (file)
--- a/app/Models/FluidbookCollection.php
+++ b/app/Models/FluidbookCollection.php
@@ -30,7 +30,7 @@ class FluidbookCollection extends ToolboxModel
         'singular' => 'collection',
         'plural' => 'collections'];
 
-    protected $_operations = [PreviewOperation::class, DownloadOperation::class,ChangeownerOperation::class];
+    protected $_operations = [PreviewOperation::class, DownloadOperation::class, ChangeownerOperation::class];
 
     protected static $_permissionBase = 'fluidbook-collection';
 
@@ -43,13 +43,13 @@ class FluidbookCollection extends ToolboxModel
         $this->addOwnerField();
 
         $this->addField('hash', Hidden::class);
-        $this->addField('type', SelectFromArray::class, __('Type'), ['column' => true, 'options' => ['export' => __('Export'), 'export_multilang' => __('Export multilingue'), 'scorm_multilang' => __('SCORM multilingue')]]);
+        $this->addField('type', SelectFromArray::class, __('Type'), ['can' => 'fluidbook-collection:write', 'column' => true, 'options' => ['export' => __('Export'), 'export_multilang' => __('Export multilingue'), 'scorm_multilang' => __('SCORM multilingue')]]);
         $this->addField('locale_switch', Checkbox::class, __('Permettre le changement de langue'), ['when' => ['type' => ['scorm_multilang', 'export_multilang']], 'default' => true]);
         $this->addField('version', FluidbookExportVersion::class, __('Version'), ['when' => ['type' => 'export']]);
         $this->addField('publications', BunchOfFieldsMultiple::class, __('Publications'), ['bunch' => CollectionPublication::class, 'edit_label' => '%fluidbook > %dir']);
         $this->addField('install', ExternalPath::class, 'Installer sur un serveur externe', ['default' => '', 'fake' => true, 'translatable' => false, 'store_in' => 'settings', 'servers_model' => FluidbookExternalInstallServer::class, ['when' => ['type' => ['export', 'export_multilang']]]]);
         $this->addField('override_settings', BunchOfFieldsMultiple::class, __('Redéfinir les paramètres lors de l\'export'), ['bunch' => Fluidbook_Setting::class]);
-        $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('visits_counter', Integer::class, 'Compteur de visites', ['can' => 'fluidbook-collection:write', '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]);
     }
 
     public function getFinalPath()

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index c09bccca4b8159c1732f490885edfccdf9560579..5caf1c97915d41b1e92bc86d16dee73adcfc3ccc 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -172,7 +172,7 @@ class FluidbookPublication extends ToolboxSettingsModel
 
         $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, 'searchLogic' => false]);
+            ['default' => 'fr', 'allows_null' => false, 'filter' => true, 'filter_label' => 'Langue', 'column' => true, 'column_move_after' => 'c_title', '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'));