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

Merge branch 'substitution-debug' into develop

parents d6aa287f e6a4c41e

module/Application/src/Application/Controller/SubstitutionController.php

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ class SubstitutionController extends AbstractController 
            'structuresConcretesSubstituees' => $structuresConcretesSubstituees,

            'structuresConcretes' => $structures,

            'type' => $type,

            'structureCibleLogoContent' => $this->structureService->getLogoStructureContent(),

        ]);

        $vm->setTemplate('application/substitution/modifier');

module/Application/src/Application/Service/Structure/StructureService.php

+2 −2
Original line number Diff line number Diff line
@@ -828,9 +828,9 @@ class StructureService extends BaseService 
     * @param StructureInterface $structure

     * @return string|null

     */

    public function getLogoStructureContent(StructureInterface $structure)

    public function getLogoStructureContent(StructureInterface $structure = null)

    {

        if ($structure->getCheminLogo() === null) {

        if ($structure === null OR $structure->getCheminLogo() === null) {

            return Util::createImageWithText("Aucun logo|renseigné", 200, 200);

        }

module/Application/src/Application/View/Helper/StructureSubstitHelper.php

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class StructureSubstitHelper extends AbstractHelper 
     * @param string                     $logoContent

     * @return string

     */

    public function structureSource(StructureConcreteInterface $structurestructureConcrete, string $logoContent)

    public function structureSource(StructureConcreteInterface $structurestructureConcrete, $logoContent)

    {

        $texte = '<div class="panel panel-info" id="panel_' . $structurestructureConcrete->getId() . '" >';

        $texte .= '<div class="panel-heading">';