From 38051bb2083d600bde49a7e424495c754f16fdad Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 23 Aug 2023 11:47:09 +0200 Subject: [PATCH] wait #6091 @0.5 --- app/Console/Kernel.php | 2 +- .../FluidbookPublication/UpgradeOperation.php | 1 - app/Models/FluidbookPublication.php | 31 ++++++++++++++----- .../fluidbook_publication/upgrade.blade.php | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 515c9c33f..26d545308 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -36,7 +36,7 @@ class Kernel extends \Cubist\Backpack\Console\Kernel $schedule->command('job:dispatchNow Maintenance\\\\RemoveDuplicates')->monthly(); // WS to Toolbox migration $schedule->command('ws:migrate --publications=v2 --documents=missing')->dailyAt('1:00'); - $schedule->command('ws:migrate --publications=missing --documents=missing')->hourly(); + $schedule->command('ws:migrate --publications=missing --documents=missing')->everyFifteenMinutes(); $schedule->command('fluidbook:quote --reminder')->weekdays()->at('10:00'); } diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/UpgradeOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/UpgradeOperation.php index dfb6be420..53cc9e020 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/UpgradeOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/UpgradeOperation.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers\Admin\Operations\FluidbookPublication; -use App\Http\Middleware\CheckIfAdmin; use App\Models\FluidbookPublication; use Illuminate\Support\Facades\Route; use Prologue\Alerts\Facades\Alert; diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 6885996fa..16caf4960 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -4,17 +4,13 @@ namespace App\Models; use App\Console\Commands\WorkshopMigration; -use App\Fields\CubedesignersTeamMember; use App\Fields\FluidbookChapters; use App\Fields\FluidbookComposition; -use App\Fields\FluidbookID; -use App\Fields\FluidbookIDOptionnal; use App\Fields\FluidbookLocale; use App\Fields\FluidbookProjectManager; use App\Fields\FluidbookStatus; use App\Fields\FluidbookV3ID; use App\Fields\User; -use App\Fluidbook\Compiler\Compiler; use App\Fluidbook\Farm; use App\Fluidbook\Link\Link; use App\Fluidbook\Link\LinksData; @@ -34,7 +30,6 @@ use App\Http\Controllers\Admin\Operations\FluidbookPublication\UpgradeOperation; use App\Jobs\FluidbookImagesPreprocess; use App\Jobs\FluidbookSocialImage; use App\Jobs\GenerateDeliveryThumbnailsPreview; -use App\Jobs\GenerateSecondPagePreview; use App\Models\Base\ToolboxSettingsModel; use App\Models\Traits\CheckHash; use App\Models\Traits\PublicationSettings; @@ -42,16 +37,13 @@ use App\Models\Traits\PublicationTags; use App\Models\Traits\SCORMVersionTrait; use App\Slack\Slack; use App\SubForms\Link\Base; -use Cubist\Backpack\CubistBackpackServiceProvider; use Cubist\Backpack\Magic\Fields\Checkbox; use Cubist\Backpack\Magic\Fields\FormBigSection; -use Cubist\Backpack\Magic\Fields\FormSeparator; use Cubist\Backpack\Magic\Fields\FormSuperSection; use Cubist\Backpack\Magic\Fields\Hidden; use Cubist\Backpack\Magic\Fields\Integer; use Cubist\Backpack\Magic\Fields\SelectFromArray; use Cubist\Backpack\Magic\Operations\CreateOperation; -use Cubist\Excel\Excel; use Cubist\Excel\ExcelToArray; use Cubist\Util\ArrayUtil; use Cubist\Util\Files\Files; @@ -684,6 +676,17 @@ class FluidbookPublication extends ToolboxSettingsModel return $this->allowsUpdate(); } + public function allowsUpgrade() + { + if (!can('fluidbook-publication:write')) { + return false; + } + if ($this->version >= 3) { + return false; + } + return true; + } + public function allowsClone() { @@ -961,6 +964,18 @@ class FluidbookPublication extends ToolboxSettingsModel return $this->_fluidbookToUseForComposition->$name; } + public function upgrade($version = "latest") + { + if ($version === 'latest') { + $version = 3; + } + $this->version = $version; + $this->save(); + + DB::update('UPDATE ' . WorkshopMigration::OLD_DB . '.books SET version=' . $version . ' WHERE book_id=' . $this->id); + } + + public function generateThumbnailsPreview($sync = false) { diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/upgrade.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/upgrade.blade.php index b98efbb57..16a26a666 100644 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/upgrade.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/upgrade.blade.php @@ -5,7 +5,7 @@ __('Assurez-vous d\'avoir testé votre publication avec le compilateur en version 3 avant de poursuivre.'.' '. __('Cette opération est irréversible.')); @endphp -@if($entry->version<3 && $entry->allowsEdit()) +@if($entry->version<3 && $entry->allowsUpgrade())