From 45788f97ad05518ebeea8c36a10a68e831775a27 Mon Sep 17 00:00:00 2001 From: Alex Arnaud <alex.arnaud@biblibre.com> Date: Mon, 11 Mar 2024 14:10:08 +0000 Subject: [PATCH] hotline#197605 : Fix activities registration when there is a title from settings --- VERSIONS_HOTLINE/197605 | 1 + .../Library/View/Wrapper/RichContent/Section.php | 2 +- .../scenarios/Activities/ActivitiesWithQueueAbonneTest.php | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 VERSIONS_HOTLINE/197605 diff --git a/VERSIONS_HOTLINE/197605 b/VERSIONS_HOTLINE/197605 new file mode 100644 index 00000000000..2df1ab0208a --- /dev/null +++ b/VERSIONS_HOTLINE/197605 @@ -0,0 +1 @@ + - correctif #197605 : Corrige une erreur 500 sur l'inscription aux activités \ No newline at end of file diff --git a/library/templates/Intonation/Library/View/Wrapper/RichContent/Section.php b/library/templates/Intonation/Library/View/Wrapper/RichContent/Section.php index e881479246f..27245e5e3f3 100644 --- a/library/templates/Intonation/Library/View/Wrapper/RichContent/Section.php +++ b/library/templates/Intonation/Library/View/Wrapper/RichContent/Section.php @@ -129,7 +129,7 @@ abstract class Intonation_Library_View_Wrapper_RichContent_Section { return $settings->$data_name(); }); - return $title + return ($title && $this->getWrapper()) ? sprintf($title, $this->getWrapper()->getMainTitle()) : $this->getTitle(); } diff --git a/tests/scenarios/Activities/ActivitiesWithQueueAbonneTest.php b/tests/scenarios/Activities/ActivitiesWithQueueAbonneTest.php index 256d3685ab7..26306cbb279 100644 --- a/tests/scenarios/Activities/ActivitiesWithQueueAbonneTest.php +++ b/tests/scenarios/Activities/ActivitiesWithQueueAbonneTest.php @@ -333,6 +333,13 @@ class ActivitiesWithQueueAbonneIntonationWithQuotasFullInQueueValdationViewTest 'queue' => true, 'created_at' => '2021-04-01 14:00:00' ]); + + $conf = (new Class_Systeme_Widget_Action) + ->setId('abonne_fiche') + ->setProfileId(23) + ->set('PolygoneLabelUserAgenda', 'Agenda') + ->load(); + Class_SessionActivity::find(35) ->addSessionActivityInscription($this->_inscription) ->assertSave(); -- GitLab