]> _ Git - fluidbook-toolbox.git/commitdiff
wip #6540 @0.25
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 1 Dec 2023 09:10:01 +0000 (10:10 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 1 Dec 2023 09:10:01 +0000 (10:10 +0100)
1  2 
app/Models/FluidbookCollection.php
app/Models/FluidbookExternalInstallServer.php
app/Models/FluidbookPublication.php
app/Models/FluidbookTheme.php

index 4eb36035af41a72ec4aea902306c9cecf2e146cc,738a398f2ad0a3a2b93ff48d338826b5d978cdcc..7fc469bbfc75a5479975e05581fd8a2982088ff6
@@@ -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\ToolboxModel;
+ use App\Models\Base\ToolboxDownloadable;
 +use App\Jobs\RefreshUsersTree;
  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']);
index ef030f5b174b29549c131cfae792f309f118b3d7,5a9e7614f37b3467b350a614344e6db8a60a2022..6515b35a4e297398f0e615e37e62e2d76bd6e7c2
@@@ -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;
index 79d9200cfcb13ecc6972ad71ac92537950e4efbf,043a591a06967a94114dc1863edb9e1fb7da9362..d1a48db2347e57fe774b6583310870f67b0e3637
@@@ -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;
index e03e5d2a08009f81e80ce4ba773ec5b4b04dc083,b7e763e44e0dae6b5640930271efd3e668c38325..9c9d7a97c393da4ae69e86f0b3b01f4f38e065fd
@@@ -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;