From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 1 Dec 2023 09:10:01 +0000 (+0100)
Subject: wip #6540 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2773a32e3e293131b045144b308f3a553c848be2;p=fluidbook-toolbox.git

wip #6540 @0.25
---

2773a32e3e293131b045144b308f3a553c848be2
diff --cc app/Models/FluidbookCollection.php
index 4eb36035a,738a398f2..7fc469bbf
--- a/app/Models/FluidbookCollection.php
+++ b/app/Models/FluidbookCollection.php
@@@ -8,8 -8,7 +8,8 @@@ use App\Http\Controllers\Admin\Operatio
  use App\Http\Controllers\Admin\Operations\ChangestatusOperation;
  use App\Http\Controllers\Admin\Operations\FluidbookCollection\DownloadOperation;
  use App\Http\Controllers\Admin\Operations\FluidbookCollection\PreviewOperation;
+ use App\Models\Base\ToolboxDownloadable;
 +use App\Jobs\RefreshUsersTree;
- use App\Models\Base\ToolboxModel;
  use App\Models\Base\ToolboxStatusModel;
  use App\Models\Traits\CheckHash;
  use App\Slack\Slack;
@@@ -103,15 -80,7 +104,14 @@@ class FluidbookCollection extends Toolb
          return Files::mkdir(protected_path('fluidbookcollection/final/' . $this->id));
      }
  
 +    public function onSaving(): bool
 +    {
 +        $this->checkHash();
 +        $this->setOwner($this->owner);
 +        $this->setStatus($this->status);
 +        return parent::onSaving();
 +    }
  
- 
      public function allowsPreview()
      {
          return parent::allowsPreview() && !!$this->hash && in_array($this->type, ['export_multilang', 'scorm_multilang']);
diff --cc app/Models/FluidbookExternalInstallServer.php
index ef030f5b1,5a9e7614f..6515b35a4
--- a/app/Models/FluidbookExternalInstallServer.php
+++ b/app/Models/FluidbookExternalInstallServer.php
@@@ -2,10 -2,9 +2,9 @@@
  
  namespace App\Models;
  
 +use App\Http\Controllers\Admin\Operations\ServerOperation;
  use Cubist\Backpack\Magic\Fields\Checkbox;
  use Cubist\Backpack\Magic\Fields\Table;
--use Cubist\Backpack\Magic\Fields\Text;
  use Cubist\Backpack\Magic\Models\ExternalServer;
  use Cubist\Net\Transfer\Local;
  use Cubist\Util\Files\Files;
diff --cc app/Models/FluidbookPublication.php
index 79d9200cf,043a591a0..d1a48db23
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@@ -35,7 -34,8 +35,9 @@@ use App\Http\Controllers\Admin\Operatio
  use App\Jobs\FluidbookImagesPreprocess;
  use App\Jobs\FluidbookSocialImage;
  use App\Jobs\GenerateDeliveryThumbnailsPreview;
+ use App\Models\Base\ToolboxDownloadable;
+ use App\Models\Base\ToolboxSettingsModel;
 +use App\Models\Base\ToolboxStatusModel;
  use App\Models\Traits\CheckHash;
  use App\Models\Traits\PublicationSettings;
  use App\Models\Traits\PublicationTags;
diff --cc app/Models/FluidbookTheme.php
index e03e5d2a0,b7e763e44..9c9d7a97c
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@@ -5,7 -5,11 +5,10 @@@ namespace App\Models
  
  use App\Fields\FluidbookFont;
  use App\Fields\FluidbookThemeImage;
+ use App\Fields\HorizontalAlign;
+ use App\Fields\ThemeBackgroundSize;
+ use App\Fields\VerticalAlign;
  use App\Http\Controllers\Admin\Operations\ChangeownerOperation;
 -use App\Http\Controllers\Admin\Operations\QuizTheme\PreviewOperation;
  use App\Jobs\GenerateThemePreview;
  use App\Jobs\UpdateWS2ThemeTable;
  use App\Models\Base\ToolboxModel;