From: Vincent Vanwaelscappel Date: Mon, 20 Nov 2023 14:02:57 +0000 (+0100) Subject: wip #6494 @1.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=364e5391bb93247f6918df6422a1a5ba9cbffc60;p=fluidbook-toolbox.git wip #6494 @1.25 --- diff --git a/app/Models/Base/ToolboxStatusModel.php b/app/Models/Base/ToolboxStatusModel.php index 0c2b26113..bec1af379 100644 --- a/app/Models/Base/ToolboxStatusModel.php +++ b/app/Models/Base/ToolboxStatusModel.php @@ -37,10 +37,10 @@ class ToolboxStatusModel extends ToolboxModel public function allowsPreview() { - if (!can(static::$_permissionBase.':write')) { + if (can(static::$_permissionBase . ':write')) { return true; } - if (!can(static::$_permissionBase.':read')) { + if (!can(static::$_permissionBase . ':read')) { return false; } if ($this->status == 0) { diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index eeef3ebcf..910718b51 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -1049,8 +1049,8 @@ class FluidbookPublication extends ToolboxStatusModel return $list; } - public function hasIssue() + public function allowsPreview() { - + return parent::allowsPreview() && $this->getPagesNumber() > 0; } } diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php index f3521fb8e..2c25fb7f3 100644 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/preview.blade.php @@ -18,7 +18,7 @@ @endphp -@if($entry->getPagesNumber()>0 && $entry->allowsPreview()) +@if($entry->allowsPreview()) 1)