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

Merge branch 'hotfix_renommage'

parents 5db30418 a5e4a986

module/Application/src/Application/Controller/EtablissementController.php

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ class EtablissementController extends StructureConcreteController 
            'roleListing'     => $roleListings,

            'individuListing' => $individuListings,

            'logoContent'     => $this->structureService->getLogoStructureContent($etablissement),

            'signatureConvocation' => $this->etablissementService->getSignatureConvocationContent($etablissement),

            'signatureConvocation' => ($etablissement->getSignatureConvocation())?($this->fichierService->computeDestinationFilePathForFichier($etablissement->getSignatureConvocation())):null,

        ]);

    }

module/Application/view/application/etablissement/information.phtml

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * @var array $roleListing (string => int)

 * @var array $individuListing (string => string[])

 * @var string $logoContent

 * @var string $signatureFilepath

 * @var string $signatureConvocation

 */



use Application\Entity\Db\Etablissement;
@@ -15,7 +15,7 @@ use Application\Entity\Db\TypeStructure; 
use Application\Provider\Privilege\EtablissementPrivileges;

use Application\Provider\Privilege\StructurePrivileges;



$content = ($signatureFilepath)?file_get_contents($signatureFilepath):null;

$content = ($signatureConvocation)?file_get_contents($signatureConvocation):"";

$this->headTitle('Details de l\'établissement ['.$etablissement->getLibelle().']');



$canAddRole = true;