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

Fixing route structure/afficher

parent 983ef02e

module/Application/src/Application/Controller/FicheProfilController.php

+4 −4
Changes for module/Application/src/Application/Controller/FicheProfilController.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class FicheProfilController extends AbstractActionController { 
            $form->setData($data);

            if ($form->isValid()) {

                $this->getFicheProfilService()->create($ficheprofil);

                return $this->redirect()->toRoute('structure/afficher', ['structure' => $structure->getId()], ['fragment' => 'profil'], true);

                return $this->redirect()->toRoute('structure/description', ['structure' => $structure->getId()], ['fragment' => 'profil'], true);

            }

        }
@@ -95,7 +95,7 @@ class FicheProfilController extends AbstractActionController { 
            $form->setData($data);

            if ($form->isValid()) {

                $this->getFicheProfilService()->update($ficheprofil);

                return $this->redirect()->toRoute('structure/afficher', ['structure' => $structure->getId()], ['fragment' => 'profil'], true);

                return $this->redirect()->toRoute('structure/description', ['structure' => $structure->getId()], ['fragment' => 'profil'], true);

            }

        }
@@ -133,14 +133,14 @@ class FicheProfilController extends AbstractActionController { 
    {

        $ficheprofil = $this->getFicheProfilService()->getRequestedFicheProfil($this);

        $this->getFicheProfilService()->historise($ficheprofil);

        return $this->redirect()->toRoute('structure/afficher', ['structure' => $ficheprofil->getStructure()->getId()], ['fragment' => 'profil'], true);

        return $this->redirect()->toRoute('structure/description', ['structure' => $ficheprofil->getStructure()->getId()], ['fragment' => 'profil'], true);

    }



    public function restaurerAction()

    {

        $ficheprofil = $this->getFicheProfilService()->getRequestedFicheProfil($this);

        $this->getFicheProfilService()->restore($ficheprofil);

        return $this->redirect()->toRoute('structure/afficher', ['structure' => $ficheprofil->getStructure()->getId()], ['fragment' => 'profil'], true);

        return $this->redirect()->toRoute('structure/description', ['structure' => $ficheprofil->getStructure()->getId()], ['fragment' => 'profil'], true);

    }



    public function supprimerAction()

module/Application/view/application/fiche-poste/partial/retour-structure.phtml

+1 −1
Changes for module/Application/view/application/fiche-poste/partial/retour-structure.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $canGereStructure = $this->isAllowed(StructurePrivileges::getResourceId(Structur 


<div class="row">

    <?php if ($structure !== null AND $canGereStructure) : ?>

        <a href="<?php echo $this->url('structure/afficher', ['structure' => $structure->getId()], [], true); ?>"

        <a href="<?php echo $this->url('structure/fiches-de-poste', ['structure' => $structure->getId()], [], true); ?>"

           class="btn btn-primary action" style="margin:1rem;">

            <span class="icon icon-retour"></span>

            Retour vers  la structure

module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/partial/header.phtml

+1 −1
Changes for module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/partial/header.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ $canAfficherInformationMetier = ( 


                            <?php

                                $structureLibelle = "[" .$structure->getLibelleCourt(). "] ". $structure->getLibelleLong();

                                $structureUrl = $this->url("structure/afficher", ['structure' => $structure->getId()], [], true);

                                $structureUrl = $this->url("structure/description", ['structure' => $structure->getId()], [], true);

                                $canAfficherStructure = $this->isAllowed($structure, StructurePrivileges::STRUCTURE_AFFICHER);

                            ?>

                                <?php if ($canAfficherStructure) : ?>

module/Structure/src/Structure/Controller/StructureController.php

+1 −1
Changes for module/Structure/src/Structure/Controller/StructureController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ class StructureController extends AbstractActionController { 


        $retour = $this->params()->fromQuery('retour');

        if ($retour !== null) return $this->redirect()->toUrl($retour);

        return $this->redirect()->toRoute('structure/afficher', ['structure' => $structure->getId()], [], true);

        return $this->redirect()->toRoute('structure/description', ['structure' => $structure->getId()], [], true);

    }



    /** Fonctions de recherche ****************************************************************************************/

module/Structure/view/structure/structure/fiches-de-poste.phtml

+1 −1
Changes for module/Structure/view/structure/structure/fiches-de-poste.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ $date = new DateTime(); 
                                    <?php if ($canDetruireFichier) : ?>

                                        <a

                                            <?php /** @see \Fichier\Controller\FichierController::deleteAction() */?>

                                                href="<?php echo $this->url('delete-fichier', ['fichier' => $fichier->getId()], ['query' => ['retour' => $this->url('structure/afficher', ['structure' => $structure->getId()], true)]], true); ?>"

                                                href="<?php echo $this->url('delete-fichier', ['fichier' => $fichier->getId()], ['query' => ['retour' => $this->url('structure/fiches-de-poste', ['structure' => $structure->getId()], true)]], true); ?>"

                                        >

                                            <span class="icon icon-retirer" title="supprimer le fichier"></span></a>

                                    <?php else : ?>