diff --git a/src/UnicaenValidation/Controller/ValidationInstanceController.php b/src/UnicaenValidation/Controller/ValidationInstanceController.php index dfd1775520fd2b774d6b3f5e5c0b9aef0ef328fa..cebd003b06a55f1c07c10efa5a5c921e772e78c9 100644 --- a/src/UnicaenValidation/Controller/ValidationInstanceController.php +++ b/src/UnicaenValidation/Controller/ValidationInstanceController.php @@ -91,7 +91,7 @@ class ValidationInstanceController extends AbstractActionController { $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); - return $this->redirect()->toRoute('validation/instance'); + return $this->redirect()->toRoute('validation/instance', [], ["query" => $this->params()->fromQuery()], true); } public function restaurerAction() : Response @@ -101,7 +101,7 @@ class ValidationInstanceController extends AbstractActionController { $retour = $this->params()->fromQuery('retour'); if ($retour) return $this->redirect()->toUrl($retour); - return $this->redirect()->toRoute('validation/instance'); + return $this->redirect()->toRoute('validation/instance', [], ["query" => $this->params()->fromQuery()], true); } public function detruireAction() : ViewModel diff --git a/view/unicaen-validation/validation-instance/index.phtml b/view/unicaen-validation/validation-instance/index.phtml index b6a309a8027a02938e26e429fb68a01dc1d3e71b..7cc3cf93f59830b8112b299ed052954791c3d4dc 100644 --- a/view/unicaen-validation/validation-instance/index.phtml +++ b/view/unicaen-validation/validation-instance/index.phtml @@ -4,6 +4,7 @@ * @see \UnicaenValidation\Controller\ValidationInstanceController::indexAction() * @var ValidationInstance[] $instances * @var ValidationType[] $types + * @var array $params */ use UnicaenValidation\Entity\Db\ValidationInstance; @@ -85,15 +86,15 @@ $canAfficherType = $this->isAllowed(ValidationTypePrivileges::getResourceId(Vali <?php if ($canHistoriser): ?> <?php if ($instance->estNonHistorise()) :?> <a - <?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::modifierAction() */?> - href="<?php echo $this->url('validation/instance/historiser', ['validation' => $instance->getId()], [], true); ?>" + <?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::historiserAction() */?> + href="<?php echo $this->url('validation/instance/historiser', ['validation' => $instance->getId()], ['query' => $params], true); ?>" > <span class="icon icon-historiser" title="Historiser l'instance de validation"></a> <?php else : ?> <a - <?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::modifierAction() */?> - href="<?php echo $this->url('validation/instance/restaurer', ['validation' => $instance->getId()], [], true); ?>" + <?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::restaurerAction() */?> + href="<?php echo $this->url('validation/instance/restaurer', ['validation' => $instance->getId()], ['query' => $params], true); ?>" > <span class="icon icon-restaurer" title="Restaurer l'instance de validation"></a> <?php endif; ?> @@ -105,7 +106,7 @@ $canAfficherType = $this->isAllowed(ValidationTypePrivileges::getResourceId(Vali href="<?php echo $this->url('validation/instance/detruire', ['validation' => $instance->getId()], [], true); ?>" class="ajax-modal" data-event="modification" > - <span class="icon icon-retirer text-danger" title="Supprimer définitivement l'instance de validation"></a> + <span class="icon icon-unchecked text-danger" title="Supprimer définitivement l'instance de validation"></a> <?php endif; ?> </td> </tr>