From 57bbc85cecda42fba08900e71faa2958b74f8d81 Mon Sep 17 00:00:00 2001 From: Ambroise Maupate Date: Wed, 12 Jul 2023 16:58:02 +0200 Subject: [PATCH] fix: Do not display document thumbnail controls for audio, video --- lib/Documents/src/ArrayDocumentFinder.php | 1 - lib/Documents/src/OptionsResolver/UrlOptionsResolver.php | 6 ++---- .../src/Controller/Document/DocumentArchiveController.php | 1 + .../Controller/Document/DocumentDuplicatesController.php | 1 + .../Controller/Document/DocumentPublicListController.php | 1 + .../src/Controller/Document/DocumentUnusedController.php | 1 + .../src/Controllers/Documents/DocumentsController.php | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/Documents/src/ArrayDocumentFinder.php b/lib/Documents/src/ArrayDocumentFinder.php index 57984031..14a4f019 100644 --- a/lib/Documents/src/ArrayDocumentFinder.php +++ b/lib/Documents/src/ArrayDocumentFinder.php @@ -5,7 +5,6 @@ namespace RZ\Roadiz\Documents; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Collections\Collection; use RZ\Roadiz\Documents\Models\DocumentInterface; /** diff --git a/lib/Documents/src/OptionsResolver/UrlOptionsResolver.php b/lib/Documents/src/OptionsResolver/UrlOptionsResolver.php index fa3c512d..ac34da79 100644 --- a/lib/Documents/src/OptionsResolver/UrlOptionsResolver.php +++ b/lib/Documents/src/OptionsResolver/UrlOptionsResolver.php @@ -11,8 +11,7 @@ class UrlOptionsResolver extends OptionsResolver { public function __construct() { - $this->setDefaults( - [ + $this->setDefaults([ 'crop' => null, 'fit' => null, 'align' => null, @@ -31,8 +30,7 @@ public function __construct() 'contrast' => 0, 'rotate' => 0, 'ratio' => null, - ] - ); + ]); $this->setAllowedTypes('width', ['int']); $this->setAllowedTypes('height', ['int']); $this->setAllowedTypes('crop', ['null', 'string']); diff --git a/lib/RoadizRozierBundle/src/Controller/Document/DocumentArchiveController.php b/lib/RoadizRozierBundle/src/Controller/Document/DocumentArchiveController.php index 63c77c4d..a7756bce 100644 --- a/lib/RoadizRozierBundle/src/Controller/Document/DocumentArchiveController.php +++ b/lib/RoadizRozierBundle/src/Controller/Document/DocumentArchiveController.php @@ -81,6 +81,7 @@ public function bulkDownloadAction(Request $request): Response 'sharpen' => 5, 'inline' => false, 'picture' => true, + 'controls' => false, 'loading' => 'lazy', ]; diff --git a/lib/RoadizRozierBundle/src/Controller/Document/DocumentDuplicatesController.php b/lib/RoadizRozierBundle/src/Controller/Document/DocumentDuplicatesController.php index 4f38be64..4adfd5c2 100644 --- a/lib/RoadizRozierBundle/src/Controller/Document/DocumentDuplicatesController.php +++ b/lib/RoadizRozierBundle/src/Controller/Document/DocumentDuplicatesController.php @@ -60,6 +60,7 @@ public function duplicatedAction(Request $request): Response 'sharpen' => 5, 'inline' => false, 'picture' => true, + 'controls' => false, 'loading' => 'lazy', ]; diff --git a/lib/RoadizRozierBundle/src/Controller/Document/DocumentPublicListController.php b/lib/RoadizRozierBundle/src/Controller/Document/DocumentPublicListController.php index b7ff31de..cf5dcc51 100644 --- a/lib/RoadizRozierBundle/src/Controller/Document/DocumentPublicListController.php +++ b/lib/RoadizRozierBundle/src/Controller/Document/DocumentPublicListController.php @@ -151,6 +151,7 @@ public function indexAction(Request $request, ?int $folderId = null): Response 'sharpen' => 5, 'inline' => false, 'picture' => true, + 'controls' => false, 'loading' => 'lazy', ]; diff --git a/lib/RoadizRozierBundle/src/Controller/Document/DocumentUnusedController.php b/lib/RoadizRozierBundle/src/Controller/Document/DocumentUnusedController.php index 20289d38..945aedbd 100644 --- a/lib/RoadizRozierBundle/src/Controller/Document/DocumentUnusedController.php +++ b/lib/RoadizRozierBundle/src/Controller/Document/DocumentUnusedController.php @@ -62,6 +62,7 @@ public function unusedAction(Request $request): Response 'sharpen' => 5, 'inline' => false, 'picture' => true, + 'controls' => false, 'loading' => 'lazy', ]; diff --git a/lib/Rozier/src/Controllers/Documents/DocumentsController.php b/lib/Rozier/src/Controllers/Documents/DocumentsController.php index bbc36579..1acffaed 100644 --- a/lib/Rozier/src/Controllers/Documents/DocumentsController.php +++ b/lib/Rozier/src/Controllers/Documents/DocumentsController.php @@ -78,6 +78,7 @@ class DocumentsController extends RozierApp 'sharpen' => 5, 'inline' => false, 'picture' => true, + 'controls' => false, 'loading' => 'lazy', ]; private EmbedFinderFactory $embedFinderFactory;