diff --git a/VERSIONS_HOTLINE/140446 b/VERSIONS_HOTLINE/140446 new file mode 100644 index 0000000000000000000000000000000000000000..99a5bcd26097e12f7b76e64d95e455e4225ac7c8 --- /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 2162b48f89b24e728dbdf94a789c37c4a22949f0..b45919ba8d422dfdee4c9b3c7978386396cb2a8d 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 d729d5c85fa1a53bf30243b1c8394c43698fbfb5..80100f26893e8888007513e3e1c403cde8945199 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'); + } +}