Skip to content
Snippets Groups Projects
Commit cc4fa2d3 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

[FIX] retour qui merdouille

parent 6824519b
No related branches found
No related tags found
No related merge requests found
Pipeline #22535 passed
...@@ -91,7 +91,7 @@ class ValidationInstanceController extends AbstractActionController { ...@@ -91,7 +91,7 @@ class ValidationInstanceController extends AbstractActionController {
$retour = $this->params()->fromQuery('retour'); $retour = $this->params()->fromQuery('retour');
if ($retour) return $this->redirect()->toUrl($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 public function restaurerAction() : Response
...@@ -101,7 +101,7 @@ class ValidationInstanceController extends AbstractActionController { ...@@ -101,7 +101,7 @@ class ValidationInstanceController extends AbstractActionController {
$retour = $this->params()->fromQuery('retour'); $retour = $this->params()->fromQuery('retour');
if ($retour) return $this->redirect()->toUrl($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 public function detruireAction() : ViewModel
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* @see \UnicaenValidation\Controller\ValidationInstanceController::indexAction() * @see \UnicaenValidation\Controller\ValidationInstanceController::indexAction()
* @var ValidationInstance[] $instances * @var ValidationInstance[] $instances
* @var ValidationType[] $types * @var ValidationType[] $types
* @var array $params
*/ */
use UnicaenValidation\Entity\Db\ValidationInstance; use UnicaenValidation\Entity\Db\ValidationInstance;
...@@ -85,15 +86,15 @@ $canAfficherType = $this->isAllowed(ValidationTypePrivileges::getResourceId(Vali ...@@ -85,15 +86,15 @@ $canAfficherType = $this->isAllowed(ValidationTypePrivileges::getResourceId(Vali
<?php if ($canHistoriser): ?> <?php if ($canHistoriser): ?>
<?php if ($instance->estNonHistorise()) :?> <?php if ($instance->estNonHistorise()) :?>
<a <a
<?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::modifierAction() */?> <?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::historiserAction() */?>
href="<?php echo $this->url('validation/instance/historiser', ['validation' => $instance->getId()], [], true); ?>" 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> <span class="icon icon-historiser" title="Historiser l'instance de validation"></a>
<?php else : ?> <?php else : ?>
<a <a
<?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::modifierAction() */?> <?php /** @see \UnicaenValidation\Controller\ValidationInstanceController::restaurerAction() */?>
href="<?php echo $this->url('validation/instance/restaurer', ['validation' => $instance->getId()], [], true); ?>" 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> <span class="icon icon-restaurer" title="Restaurer l'instance de validation"></a>
<?php endif; ?> <?php endif; ?>
...@@ -105,7 +106,7 @@ $canAfficherType = $this->isAllowed(ValidationTypePrivileges::getResourceId(Vali ...@@ -105,7 +106,7 @@ $canAfficherType = $this->isAllowed(ValidationTypePrivileges::getResourceId(Vali
href="<?php echo $this->url('validation/instance/detruire', ['validation' => $instance->getId()], [], true); ?>" href="<?php echo $this->url('validation/instance/detruire', ['validation' => $instance->getId()], [], true); ?>"
class="ajax-modal" data-event="modification" 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; ?> <?php endif; ?>
</td> </td>
</tr> </tr>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment