Merge branch 'hotfix/v2.1.25'

roadiz · Jul 12, 2023 · 0f29cc7 · 0f29cc7
2 parents e5491f5 + 03a33e0
commit 0f29cc7
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [v2.1.25](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.24...v2.1.25) (2023-07-12)
+
+
+### Bug Fixes
+
+* Do not display document thumbnail controls for audio, video ([57bbc85](https://github.com/roadiz/core-bundle-dev-app/commit/57bbc85cecda42fba08900e71faa2958b74f8d81))
+
 ## [v2.1.24](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.23...v2.1.24) (2023-07-06)
 
 

diff --git 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
@@ -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/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.1.24'
+    roadiz_core.cms_version: '2.1.25'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -78,6 +78,7 @@ class DocumentsController extends RozierApp
         'sharpen' => 5,
         'inline' => false,
         'picture' => true,
+        'controls' => false,
         'loading' => 'lazy',
     ];
     private EmbedFinderFactory $embedFinderFactory;