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

Merge branch 'hotfix_renommage' into develop

parents 5f0254f8 a5e4a986

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

+2 −2
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,

        ]);

    }
@@ -157,7 +157,7 @@ class EtablissementController extends StructureConcreteController 
                $files = $request->getFiles()->toArray();

                $fichiers = $this->fichierService->createFichiersFromUpload(['files' => $files], $nature);

                $this->fichierService->saveFichiers($fichiers);

                $etablissement->setCheminSignatureConvocation($fichiers[0]);

                $etablissement->setSignatureConvocation($fichiers[0]);

                $this->getEtablissementService()->update($etablissement);

        }

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;

module/Soutenance/view/soutenance/presoutenance/partial/avis-soutenance.phtml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ $tousLesEngagements = count($rapporteurs) === count($engagements) ; 
$tousLesAvis = count($rapporteurs) === count($avis) ;

?>





<div class="box panel panel-info">

    <div class="panel-heading">

        <h2> Avis de soutenance</h2>