Skip to content

Commit 8471c6f

Browse files
author
roadiz-ci
committed
Merge branch hotfix/v2.6.21
1 parent a4c3e29 commit 8471c6f

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/Controller/AbstractAdminController.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ public function addAction(Request $request): ?Response
157157

158158
public function editAction(Request $request, int|string $id): ?Response
159159
{
160-
$this->denyAccessUnlessGranted($this->getRequiredEditionRole());
161-
$this->additionalAssignation($request);
162-
163160
/** @var mixed|object|null $item */
164161
$item = $this->getRepository()->find($id);
165162
if (!($item instanceof PersistableInterface)) {
166163
throw $this->createNotFoundException();
167164
}
168165

166+
$this->denyAccessUnlessGranted($this->getRequiredEditionRole(), $item);
167+
$this->additionalAssignation($request);
168+
169169
$this->prepareWorkingItem($item);
170170
$this->denyAccessUnlessItemGranted($item);
171171

@@ -211,16 +211,16 @@ public function editAction(Request $request, int|string $id): ?Response
211211

212212
public function deleteAction(Request $request, int|string $id): ?Response
213213
{
214-
$this->denyAccessUnlessGranted($this->getRequiredDeletionRole());
215-
$this->additionalAssignation($request);
216-
217214
/** @var mixed|object|null $item */
218215
$item = $this->getRepository()->find($id);
219216

220217
if (!($item instanceof PersistableInterface)) {
221218
throw $this->createNotFoundException();
222219
}
223220

221+
$this->denyAccessUnlessGranted($this->getRequiredDeletionRole(), $item);
222+
$this->additionalAssignation($request);
223+
224224
$this->prepareWorkingItem($item);
225225
$this->denyAccessUnlessItemGranted($item);
226226

src/Controller/Ajax/AjaxTagsController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public function listArrayAction(Request $request): JsonResponse
8888
if (count($cleanTagIds)) {
8989
$tags = $this->getRepository()->findBy([
9090
'id' => $cleanTagIds,
91+
'translation' => $this->managerRegistry->getRepository(Translation::class)->findDefault(),
9192
]);
9293

9394
// Sort array by ids given in request

0 commit comments

Comments
 (0)