murph/murph-core
murph/murph-core
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases 22 Wiki Activity

change params given to the callback of a global batch action (page removed, add selected items)

Browse source
This commit is contained in:
Simon Vieille 2023-10-12 16:04:43 +02:00
parent b9b07c1409
commit 67f79083ef
Signed by: deblan
GPG key ID: 579388D585F70417
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/Controller/Admin/Crud/CrudController.php
View file

@ -287,7 +287,21 @@ abstract class CrudController extends AdminController
$useSelection = 'selection' === $target; $useSelection = 'selection' === $target;
if ($batchAction['isGlobal']) { if ($batchAction['isGlobal']) {
$result = $callback($query, $useSelection, $entityManager); $selection = null;
if ($useSelection) {
$queryClone = clone $query;
$pager = $queryClone->paginate($page, $configuration->getMaxPerPage($context));
$selection = [];
foreach ($pager as $key => $entity) {
if (isset($items[$key + 1])) {
$selection[] = $entity;
}
}
}
$result = $callback($query, $entityManager, $selection);
if ($result instanceof Response) { if ($result instanceof Response) {
return $result; return $result;
@ -295,11 +309,11 @@ abstract class CrudController extends AdminController
return $this->redirect($request->query->get('redirectTo')); return $this->redirect($request->query->get('redirectTo'));
} }
if ('selection' === $target) {
$pager = $query->paginate($page, $configuration->getMaxPerPage($context)); $pager = $useSelection
} else { ? $query->paginate($page, $configuration->getMaxPerPage($context))
$pager = $query->find(); : $query->find()
} ;
foreach ($pager as $key => $entity) { foreach ($pager as $key => $entity) {
if (($useSelection && isset($items[$key + 1])) || !$useSelection) { if (($useSelection && isset($items[$key + 1])) || !$useSelection) {