From 13b3d3548bfc990aa10801aebffd8b8e693be398 Mon Sep 17 00:00:00 2001
From: Henri-Damien LAURENT <hdlaurent@afi-sa.fr>
Date: Mon, 11 Jul 2022 16:11:32 +0200
Subject: [PATCH] hotline#160037: Articles: Allday null was crashing
---
VERSIONS_HOTLINE/160037 | 1 +
.../ZendAfi/View/Helper/TagArticleEvent.php | 2 +-
.../ArticlesMultipleTimingsViewTest.php | 18 ++++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 VERSIONS_HOTLINE/160037
diff --git a/VERSIONS_HOTLINE/160037 b/VERSIONS_HOTLINE/160037
new file mode 100644
index 00000000000..5cd666059a2
--- /dev/null
+++ b/VERSIONS_HOTLINE/160037
@@ -0,0 +1 @@
+ - correctif #160037 : Articles : Renforcement du contrôle pour le paramètre d'événement "Toute la journée"
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/TagArticleEvent.php b/library/ZendAfi/View/Helper/TagArticleEvent.php
index 923dda7d02f..3f367c5fccd 100644
--- a/library/ZendAfi/View/Helper/TagArticleEvent.php
+++ b/library/ZendAfi/View/Helper/TagArticleEvent.php
@@ -28,7 +28,7 @@ class ZendAfi_View_Helper_TagArticleEvent extends Zend_View_Helper_HtmlElement {
? $this->view->tag('span',
$this->view->article_RenderEventTiming($article->getEventsDebut(),
$article->getEventsFin(),
- $article->getAllDay(),
+ $article->getAllDay() ?? false,
$article->getPickDayAsArray()),
['class' => 'calendar_event_date'])
: '';
diff --git a/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php b/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php
index 8ebd3a963ca..888035ef47f 100644
--- a/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php
+++ b/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php
@@ -205,3 +205,21 @@ class ArticlesMultipleTimingsViewWithEmptyTimingsTest
'Dates et Horaires');
}
}
+
+
+
+
+class ArticlesMultipleTimingsViewWithNullAllDayTest extends ArticlesMultipleTimingsViewTestCase {
+ public function setUp() {
+ parent::setUp();
+ Class_Article::find(5)->setAllDay(null)->save();
+
+ $this->dispatch('/cms/articleview/id/5');
+ }
+
+
+ /** @test */
+ public function pageShouldContainsHeureDuConte() {
+ $this->assertXPathContentContains('//div[@class="titre"]//h1', 'Heure du conte');
+ }
+}
--
GitLab