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

Merge branch 'hotfix_navigation_coencadrant'

parents c34c32c3 ed6a2292

module/Application/config/others/co-encadrant.config.php

+7 −7
Original line number Diff line number Diff line
@@ -134,13 +134,13 @@ return [ 
                                'resource' => PrivilegeController::getResourceId(CoEncadrantController::class, 'index'),



                                'order'    => 300,

                                'pages' => [

                                    'historique' => [

                                        'label'    => 'Historique',

                                        'route'    => 'co-encadrant/historique',

                                        'resource' => PrivilegeController::getResourceId(CoEncadrantController::class, 'historique'),

                                    ],

                                ],

//                                'pages' => [

//                                    'historique' => [

//                                        'label'    => 'Historique',

//                                        'route'    => 'co-encadrant/historique',

//                                        'resource' => PrivilegeController::getResourceId(CoEncadrantController::class, 'historique'),

//                                    ],

//                                ],

                            ],

                        ],

                    ],

module/Application/src/Application/Service/CoEncadrant/CoEncadrantService.php

+5 −3
Original line number Diff line number Diff line
@@ -43,11 +43,13 @@ class CoEncadrantService { 
    }



    /**

     * @param int $id

     * @return Acteur

     * @param int|null $id

     * @return Acteur|null

     */

    public function getCoEncadrant(int $id)

    public function getCoEncadrant(?int $id) : ?Acteur

    {

        if ($id === null) return null;



        $qb = $this->createQueryBuilder()

            ->andWhere('acteur.id = :id')

            ->setParameter('id', $id)