Commit 37579c68 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Correction du ticket #34526

parent 25df9d36

module/Application/src/Application/Controller/IntervenantController.php

+1 −1
Changes for module/Application/src/Application/Controller/IntervenantController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ class IntervenantController extends AbstractController 
    {

        $role = $this->getServiceContext()->getSelectedIdentityRole();





        if ($intervenant = $role->getIntervenant()) {

            $etapeCourante = $this->getServiceWorkflow()->getEtapeCourante();

            if ($etapeCourante && $this->getServiceWorkflow()->isAllowed($etapeCourante)) {
@@ -87,7 +88,6 @@ class IntervenantController extends AbstractController 
    public function rechercherAction()

    {

        $recents = $this->getIntervenantsRecents();

        $var     = '';



        return compact('recents');

    }

module/Application/src/Application/Controller/PieceJointeController.php

+8 −0
Changes for module/Application/src/Application/Controller/PieceJointeController.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -72,6 +72,14 @@ class PieceJointeController extends AbstractController 
            throw new \LogicException('Intervenant non précisé ou inexistant');

        }



        if ($this->params()->fromQuery('menu', false) !== false) { // pour gérer uniquement l'affichage du menu

            $menu = new ViewModel();

            $menu->setTemplate('application/intervenant/menu');



            return $menu;

        }





        $title = "Pièces justificatives <small>{$intervenant}</small>";



        $heuresPourSeuil = $this->getServicePieceJointe()->getHeuresPourSeuil($intervenant);

module/Application/view/application/piece-jointe/index.phtml

+1 −1
Changes for module/Application/view/application/piece-jointe/index.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ $canArchiver = $this->isAllowed(Privileges::getResourceId(Privileges::PIECE_JUS 


$infosUrl = $this->url('piece-jointe/intervenant/infos', ['intervenant' => $intervenant->getId()]);



$menuUrl = $this->url('intervenant/services', ['intervenant' => $intervenant->getId()], ['query' => ['menu' => 1]]);

$menuUrl = $this->url('piece-jointe/intervenant', ['intervenant' => $intervenant->getId()], ['query' => ['menu' => 1]]);



?>

    <h1 class="page-header"><?= $this->intervenant($intervenant)->renderTitle('Pièces justificatives'); ?></h1>