Skip to content
Snippets Groups Projects
Commit c506dfb6 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'HotFix-UploadLogo' into develop

parents 6131049e 516ec8b0
No related branches found
No related tags found
No related merge requests found
......@@ -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");
......
......@@ -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
......
......@@ -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"
>
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment