From: Vincent Vanwaelscappel Date: Fri, 9 Jun 2023 15:35:32 +0000 (+0200) Subject: wait #6011 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a0a515f7a96a12074d860c8d33408026977829bd;p=fluidbook-toolbox.git wait #6011 @0.5 --- diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php index 403c4bf79..ccd1051bd 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php @@ -17,6 +17,7 @@ trait SocialImageOperation { foreach (['services', 's'] as $segment) { Route::match(['get'], $segment . '/socialimage/{cid?}', $controller . '@socialImage')->withoutMiddleware([CheckIfAdmin::class]); + Route::match(['get'], $segment . '/socialimage', $controller . '@ws2SocialImage')->withoutMiddleware([CheckIfAdmin::class]); Route::match(['get'], $segment . '/facebook_thumbnail', $controller . '@ws2SocialImage')->withoutMiddleware([CheckIfAdmin::class]); } } @@ -35,7 +36,7 @@ trait SocialImageOperation abort(404); } - public function socialImage($cid) + public function socialImage($cid = null) { $publication = FluidbookPublication::where('cid', $cid)->first(); if (null === $publication) { diff --git a/app/Models/FluidbookCollection.php b/app/Models/FluidbookCollection.php index d9287a5ff..f4507a486 100644 --- a/app/Models/FluidbookCollection.php +++ b/app/Models/FluidbookCollection.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Fields\FluidbookExportVersion; +use App\Http\Controllers\Admin\Operations\ChangeownerOperation; use App\Http\Controllers\Admin\Operations\FluidbookCollection\DownloadOperation; use App\Http\Controllers\Admin\Operations\FluidbookCollection\PreviewOperation; use App\Models\Base\ToolboxModel; @@ -29,7 +30,7 @@ class FluidbookCollection extends ToolboxModel 'singular' => 'collection', 'plural' => 'collections']; - protected $_operations = [PreviewOperation::class, DownloadOperation::class]; + protected $_operations = [PreviewOperation::class, DownloadOperation::class,ChangeownerOperation::class]; protected static $_permissionBase = 'fluidbook-collection'; diff --git a/resources/views/vendor/backpack/base/dashboard.blade.php b/resources/views/vendor/backpack/base/dashboard.blade.php index 29a1198f2..db8e3d162 100644 --- a/resources/views/vendor/backpack/base/dashboard.blade.php +++ b/resources/views/vendor/backpack/base/dashboard.blade.php @@ -2,7 +2,6 @@ @extends(backpack_view('blank')) @php - \Illuminate\Support\Facades\Log::warning('test !!'); \App\Widgets::fluidbookQuoteWidgets(); \App\Widgets::notificationsWidget(['class' => 'col-sm-8 dashboard-wrapper'],'dashboard',__('Notifications')); \App\Widgets::teamWidgets(['class' => 'col-sm-4 dashboard-wrapper'],'dashboard',__('Planning de l\'équipe'));