From 1a45f9f492a48d451054e30bc8898c178f31cbae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ANDRE=20s=C3=A9bastien?= <sandre@afi-sa.fr>
Date: Tue, 28 Sep 2021 17:13:07 +0200
Subject: [PATCH] hotline : #140446 : without event timings don't title
---
VERSIONS_HOTLINE/140446 | 1 +
.../Helper/Article/RenderEventTimings.php | 3 +++
.../ArticlesMultipleTimingsViewTest.php | 24 +++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 100644 VERSIONS_HOTLINE/140446
diff --git a/VERSIONS_HOTLINE/140446 b/VERSIONS_HOTLINE/140446
new file mode 100644
index 00000000000..99a5bcd2609
--- /dev/null
+++ b/VERSIONS_HOTLINE/140446
@@ -0,0 +1 @@
+ - ticket #140446 : Vue Article : Correction, ne pas afficher le message Dates et horaires si il n'y a pas d'évenements de programmés
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Article/RenderEventTimings.php b/library/ZendAfi/View/Helper/Article/RenderEventTimings.php
index 2162b48f89b..b45919ba8d4 100644
--- a/library/ZendAfi/View/Helper/Article/RenderEventTimings.php
+++ b/library/ZendAfi/View/Helper/Article/RenderEventTimings.php
@@ -28,6 +28,9 @@ class ZendAfi_View_Helper_Article_RenderEventTimings extends ZendAfi_View_Helper
return !$timing->isPast();
});
+ if (!$current_and_future_timings)
+ return '';
+
$human_timings = array_map(
function($timing)
{
diff --git a/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php b/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php
index d729d5c85fa..80100f26893 100644
--- a/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php
+++ b/tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsViewTest.php
@@ -145,3 +145,27 @@ class ArticlesMultipleTimingsTemplatesViewTest extends ArticlesMultipleTimingsVi
'01 juin');
}
}
+
+
+
+
+class ArticlesMultipleTimingsViewWithEmptyTimingsTest
+ extends ArticlesMultipleTimingsViewTestCase {
+
+ public function setUp() {
+ parent::setUp();
+
+ Class_Article::find(5)
+ ->setEventTimings([])
+ ->assertSave();
+
+ $this->dispatch('/cms/articleview/id/5');
+ }
+
+
+ /** @test */
+ public function articleShouldNotContainsDivForTimings() {
+ $this->assertNotXPathContentContains('//div[@class="article_timings"]/h2',
+ 'Dates et Horaires');
+ }
+}
--
GitLab