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

Persistance du logo si non renseigné et changement de la redirection et des flashMessenger

parent da3c0459

module/Application/src/Application/Controller/StructureConcreteController.php

+5 −9
Original line number Diff line number Diff line
@@ -160,28 +160,24 @@ abstract class StructureConcreteController extends AbstractController 
            $data = $request->getPost()->toArray();

            $file = $request->getFiles()->toArray();



            // action d'affacement du logo

            if (isset($data['supprimer-logo'])) {

                $this->supprimerLogoStructure();



                return $this->redirect()->toRoute($this->routeName, [], ['query' => ['selected' => $structureId], "fragment" => $structureId], true);

            }



            // action de modification

            $cheminLogo = $structureConcrete->getCheminLogo();

            $this->structureForm->setData($data);

            if ($this->structureForm->isValid()) {



                // sauvegarde du logo si fourni

                if ($file['cheminLogo']['tmp_name'] !== '') {

                    $this->ajouterLogoStructure($file['cheminLogo']['tmp_name']);

                } else {

                    $structureConcrete->setCheminLogo($cheminLogo);

                }

                // mise à jour des données relatives aux structures

                $structureConcrete = $this->structureForm->getData();

                $this->getStructureConcreteService()->update($structureConcrete);



                $this->flashMessenger()->addSuccessMessage("Structure '$structureConcrete' modifiée avec succès");



                return $this->redirect()->toRoute($this->routeName, [], ['query' => ['selected' => $structureId], "fragment" => "" . $structureId], true);

                $test = $this->routeName .'/information';

                return $this->redirect()->toRoute($this->routeName.'/information', ['structure' => $structureId], [], true);

            }

            $this->flashMessenger()->addErrorMessage("Echec de la mise à jour : données incorrectes saissie");

module/Application/view/application/ecole-doctorale/information.phtml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ $canAddRole = $canEdit; 
    École doctorale &laquo; <?php echo $ecole->getLibelle(); ?> &raquo;

</h1>



<?php echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace() ?>



<div>

    <h2>

        Informations générales

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ $canAddRole = true; 
    Details de l'établissement [  <?php echo $etablissement->getLibelle(); ?> ]

</h1>



<?php echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace() ?>



<a href="<?php echo $this->url('etablissement', [], [], true); ?>"

   class="btn btn-primary action"

   >

module/Application/view/application/unite-recherche/information.phtml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ $canAddRole = $canEdit; 
    Unité de recherche &laquo; <?php echo $unite->getLibelle(); ?> &raquo;

</h1>



<?php echo $this->messenger()->addMessagesFromFlashMessengerWithNoNamespace() ?>



<h2>

    Informations générales