wait #6091 @0.5

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 515c9c33fde610e3e8c2054c329753fe500c3813..26d5453083d1980e47467e0b9aa25cee5fdc826b 100644 (file)
--- 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 dfb6be4206761934a7c0c3362d49c291c7b24cf8..53cc9e020b24cb7b3af9c2327262ed0a3c6a3995 100644 (file)
--- 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 6885996fa837c8acb06011406ccd9913f45c5c66..16caf49600a7369bdf8defebb5e58197e6559860 100644 (file)
--- 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 b98efbb5790c60a398107c564af014a2afb049a8..16a26a66659fafd3584ea40f4fe0551825968c26 100644 (file)
--- 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())
     <a class="btn btn-sm btn-link" href="{{$crud->route}}/{{$entry->id}}/upgrade"
        data-toggle="tooltip"
        data-confirm-title="{{$upgradeConfirmTitle}}"