From: Vincent Vanwaelscappel Date: Tue, 5 Sep 2023 14:56:58 +0000 (+0200) Subject: wait #6246 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c9e91d99d0968ea5e5fcc3967a4b91bcbce29cff;p=fluidbook-toolbox.git wait #6246 @1 --- diff --git a/app/Models/Base/ToolboxModel.php b/app/Models/Base/ToolboxModel.php index 0070c72c0..cdfb1e694 100644 --- a/app/Models/Base/ToolboxModel.php +++ b/app/Models/Base/ToolboxModel.php @@ -8,10 +8,13 @@ use App\Models\FluidbookPublication; use Cubist\Backpack\Magic\Fields\HiddenDatetime; use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Auth; class ToolboxModel extends CubistMagicAbstractModel { + use SoftDeletes; + protected static $_ownerAttribute = 'owner'; public static function addOwnerClause(Builder $builder) @@ -49,7 +52,7 @@ class ToolboxModel extends CubistMagicAbstractModel if (!$user->hasPermissionTo(static::$_permissionBase . ':' . $permission)) { return false; } - if($id instanceof FluidbookPublication){ + if ($id instanceof FluidbookPublication) { return true; } $entry = static::find($id); diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 45e710b17..f24ed74c3 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -52,6 +52,7 @@ use Cubist\Util\Json; use Cubist\Util\Str; use Datetime; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; @@ -69,6 +70,7 @@ class FluidbookPublication extends ToolboxSettingsModel protected $_enableBulk = false; protected $_enableClone = false; protected $_enableCreation = false; + protected $_enableRevisions = false; protected $_enableTrackNonDefaultValues = true; protected static $_permissionBase = 'fluidbook-publication'; @@ -79,7 +81,8 @@ class FluidbookPublication extends ToolboxSettingsModel protected static $_docs = []; - protected $_operations = [CreateOperation::class, + protected $_operations = [ + CreateOperation::class, PreviewOperation::class, LinksOperation::class, CompositionOperation::class, diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/edit.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/edit.blade.php index 48db07453..a530bd7ca 100644 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/edit.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/edit.blade.php @@ -10,7 +10,7 @@ ]; - if(!$entry->composition_fluidbook || !$entry->composition_fluidbook_links){ + if($entry->getPagesNumber()>0 && (!$entry->composition_fluidbook || !$entry->composition_fluidbook_links)){ $actions ['links']= [ 'label'=>__('Modifier les liens'),