Commit cc4fa2d3 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

[FIX] retour qui merdouille

parent 6824519b

src/UnicaenValidation/Controller/ValidationInstanceController.php

+2 −2
Original line number Diff line number Diff line
@@ -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

view/unicaen-validation/validation-instance/index.phtml

+6 −5
Original line number Diff line number Diff line
@@ -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>