Merge tag v2.6.21 into develop

Author: roadiz-ci

src/Controller/AbstractAdminController.php

@@ -157,15 +157,15 @@ public function addAction(Request $request): ?Response
 
     public function editAction(Request $request, int|string $id): ?Response
     {
-        $this->denyAccessUnlessGranted($this->getRequiredEditionRole());
-        $this->additionalAssignation($request);
-
         /** @var mixed|object|null $item */
         $item = $this->getRepository()->find($id);
         if (!($item instanceof PersistableInterface)) {
             throw $this->createNotFoundException();
         }
 
+        $this->denyAccessUnlessGranted($this->getRequiredEditionRole(), $item);
+        $this->additionalAssignation($request);
+
         $this->prepareWorkingItem($item);
         $this->denyAccessUnlessItemGranted($item);
 
@@ -211,16 +211,16 @@ public function editAction(Request $request, int|string $id): ?Response
 
     public function deleteAction(Request $request, int|string $id): ?Response
     {
-        $this->denyAccessUnlessGranted($this->getRequiredDeletionRole());
-        $this->additionalAssignation($request);
-
         /** @var mixed|object|null $item */
         $item = $this->getRepository()->find($id);
 
         if (!($item instanceof PersistableInterface)) {
             throw $this->createNotFoundException();
         }
 
+        $this->denyAccessUnlessGranted($this->getRequiredDeletionRole(), $item);
+        $this->additionalAssignation($request);
+
         $this->prepareWorkingItem($item);
         $this->denyAccessUnlessItemGranted($item);
 

src/Controller/Ajax/AjaxTagsController.php

@@ -88,6 +88,7 @@ public function listArrayAction(Request $request): JsonResponse
         if (count($cleanTagIds)) {
             $tags = $this->getRepository()->findBy([
                 'id' => $cleanTagIds,
+                'translation' => $this->managerRegistry->getRepository(Translation::class)->findDefault(),
             ]);
 
             // Sort array by ids given in request