From a0a0cde0fc06674fdbe35368317b2552ef845d7f Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Wed, 4 Dec 2019 09:06:29 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Aide=20de=20vue=20FormControlGroup=20:=20co?=
 =?UTF-8?q?rrection=20de=20la=20r=C3=A9manence=20du=20helpContent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UnicaenApp/Form/View/Helper/FormControlGroup.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/UnicaenApp/Form/View/Helper/FormControlGroup.php b/src/UnicaenApp/Form/View/Helper/FormControlGroup.php
index 7e4c3c1..b8faf63 100644
--- a/src/UnicaenApp/Form/View/Helper/FormControlGroup.php
+++ b/src/UnicaenApp/Form/View/Helper/FormControlGroup.php
@@ -74,6 +74,8 @@ class FormControlGroup extends AbstractHelper
             return $this;
         }
 
+        $this->helpContent = ['before' => '', 'after' => ''];
+        
         return $this->render($element, $pluginClass);
     }
 
-- 
GitLab


From 3c670f5f9fab4e0b6ab595d246dce366e4b99725 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Thu, 28 May 2020 14:20:49 +0200
Subject: [PATCH 2/2] Ajout des scriptVars dans les scripts des hearders et du
 footer

---
 src/UnicaenApp/Exporter/Pdf.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/UnicaenApp/Exporter/Pdf.php b/src/UnicaenApp/Exporter/Pdf.php
index 581d0c2..1dce59e 100644
--- a/src/UnicaenApp/Exporter/Pdf.php
+++ b/src/UnicaenApp/Exporter/Pdf.php
@@ -401,6 +401,7 @@ class Pdf implements ExporterInterface
             'headerTitle'    => $this->headerTitle,
             'headerSubtitle' => $this->headerSubtitle,
             'logo'           => $this->logo);
+        $scriptVars = array_merge($scriptVars, current($this->scriptVars));
 
         // le logo doit être passé ainsi pour pouvoir être référencé dans la balise <img> sous la forme "var:logo"
         $this->getMpdf()->logo = $this->logo;
@@ -492,6 +493,7 @@ class Pdf implements ExporterInterface
         
         $scriptVars = array(
             'footerTitle' => $this->footerTitle);
+        $scriptVars = array_merge($scriptVars, current($this->scriptVars));
         
         if (isset($this->footerScripts['O'])) {
             $footerOdd = $this->getRenderer()->render($this->footerScripts['O'], $scriptVars);
-- 
GitLab