From c0c4c7801e6b19bca37a884f410a144d8079f422 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 9 Jun 2023 17:40:22 +0200 Subject: [PATCH] wait #6011 @0:10 --- app/Models/FluidbookCollection.php | 6 +++--- app/Models/FluidbookPublication.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/FluidbookCollection.php b/app/Models/FluidbookCollection.php index f4507a486..b5580cb4c 100644 --- 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' => '', 'searchLogic' => false]); + $this->addField('visits_counter', Integer::class, 'Compteur de visites', ['can' => 'fluidbook-collection:write', 'read_only' => true, 'default' => 0, 'column' => true, 'column_label' => '', 'searchLogic' => false]); } public function getFinalPath() diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index c09bccca4..5caf1c979 100644 --- 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' => '', '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' => '', 'non_default_tracking' => false, 'searchLogic' => false]); $this->addField('translations', \App\Fields\FluidbookTranslationOverwrite::class, __('Traductions personnalisées')); $this->addField('section_chapters', FormBigSection::class, __('Sommaire')); -- 2.39.5