diff --git a/lib/Rozier/src/Controllers/AbstractAdminController.php b/lib/Rozier/src/Controllers/AbstractAdminController.php index 4ce8161d..2d73a9ba 100644 --- a/lib/Rozier/src/Controllers/AbstractAdminController.php +++ b/lib/Rozier/src/Controllers/AbstractAdminController.php @@ -400,6 +400,14 @@ protected function getDefaultOrder(Request $request): array */ abstract protected function getDefaultRouteName(): string; + /** + * @return array + */ + protected function getDefaultRouteParameters(): array + { + return []; + } + /** * @return string */ @@ -475,7 +483,10 @@ protected function getEditRouteParameters(PersistableInterface $item): array */ protected function getPostDeleteResponse(PersistableInterface $item): Response { - return $this->redirect($this->urlGenerator->generate($this->getDefaultRouteName())); + return $this->redirect($this->urlGenerator->generate( + $this->getDefaultRouteName(), + $this->getDefaultRouteParameters() + )); } /** diff --git a/lib/Rozier/src/Controllers/AbstractAdminWithBulkController.php b/lib/Rozier/src/Controllers/AbstractAdminWithBulkController.php index cedf1f62..b47db87f 100644 --- a/lib/Rozier/src/Controllers/AbstractAdminWithBulkController.php +++ b/lib/Rozier/src/Controllers/AbstractAdminWithBulkController.php @@ -148,7 +148,10 @@ protected function bulkAction( } } $this->em()->flush(); - return $this->redirect($this->urlGenerator->generate($this->getDefaultRouteName())); + return $this->redirect($this->urlGenerator->generate( + $this->getDefaultRouteName(), + $this->getDefaultRouteParameters() + )); } } @@ -164,6 +167,7 @@ protected function bulkAction( public function bulkDeleteAction(Request $request): Response { + $this->additionalAssignation($request); return $this->bulkAction( $request, $this->getRequiredDeletionRole(), @@ -185,6 +189,7 @@ function (PersistableInterface $item) { public function bulkPublishAction(Request $request): Response { + $this->additionalAssignation($request); return $this->bulkAction( $request, $this->getRequiredRole(), @@ -206,6 +211,7 @@ function (PersistableInterface $item) { public function bulkUnpublishAction(Request $request): Response { + $this->additionalAssignation($request); return $this->bulkAction( $request, $this->getRequiredRole(), diff --git a/lib/Rozier/src/Controllers/WebhookController.php b/lib/Rozier/src/Controllers/WebhookController.php index f86bfe1c..60bccc70 100644 --- a/lib/Rozier/src/Controllers/WebhookController.php +++ b/lib/Rozier/src/Controllers/WebhookController.php @@ -58,7 +58,10 @@ public function triggerAction(Request $request, string $id): Response ); $this->publishConfirmMessage($request, $msg, $item); - return $this->redirect($this->urlGenerator->generate($this->getDefaultRouteName())); + return $this->redirect($this->urlGenerator->generate( + $this->getDefaultRouteName(), + $this->getDefaultRouteParameters() + )); } catch (TooManyWebhookTriggeredException $e) { $form->addError(new FormError('webhook.too_many_triggered_in_period', null, [ '%time%' => $e->getDoNotTriggerBefore()->format('H:i:s')