From 76de5b417c0e6ad4ecb41d377ae531a22089da24 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Thu, 4 Dec 2014 10:30:54 +0100
Subject: [PATCH] dev #17990 display images in article description
---
library/Class/Import/Typo3.php | 6 +++---
tests/library/Class/Import/Typo3Fixture.php | 2 +-
tests/library/Class/Import/Typo3Test.php | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/library/Class/Import/Typo3.php b/library/Class/Import/Typo3.php
index 09af94acbed..d6ba07d5008 100644
--- a/library/Class/Import/Typo3.php
+++ b/library/Class/Import/Typo3.php
@@ -185,7 +185,7 @@ class Class_Import_Typo3 {
}
- protected function addImage($typo_data,$body) {
+ protected function addImage($typo_data) {
if (!isset($typo_data['image']))
return '';
return '<img src="'.self::BOKEH_IMG_URL.'pics/'.$typo_data['image'].'" alt=""/>';
@@ -322,8 +322,8 @@ class Class_Import_Typo3 {
'debut' => $debut,
'fin' => $new['hidden'] ? null : $fin,
'id_user' => $this->userMap->find($new['cruser_id']),
- 'description' => $new['short'],
- 'contenu' => $new['bodytext'] ? $this->addImage($new,$new['bodytext']).$this->manipulate_body($new['bodytext']) : ' ',
+ 'description' => $new['short']? $this->addImage($new).$this->manipulate_body($new['short']): '',
+ 'contenu' => $new['bodytext'] ? $this->addImage($new).$this->manipulate_body($new['bodytext']) : ' ',
'id_cat' => $id_cat,
'status' => Class_Article::STATUS_VALIDATED,
'tags' => str_replace(', ', ';', $new['tx_danpextendnews_tags']),
diff --git a/tests/library/Class/Import/Typo3Fixture.php b/tests/library/Class/Import/Typo3Fixture.php
index d83c42b427b..50433a60c22 100644
--- a/tests/library/Class/Import/Typo3Fixture.php
+++ b/tests/library/Class/Import/Typo3Fixture.php
@@ -143,7 +143,7 @@ class MockTypo3DB {
'starttime' => 1415110980,
'endtime' => 1422973380,
'hidden' => 0,
- 'short' => null,
+ 'short' => 'A bord.',
'category' => 10,
'image' => 'bateau.jpg',
'tx_danpextendnews_tags' => 'pirate, bateau',
diff --git a/tests/library/Class/Import/Typo3Test.php b/tests/library/Class/Import/Typo3Test.php
index 825c9be3a60..b95c0bc542d 100644
--- a/tests/library/Class/Import/Typo3Test.php
+++ b/tests/library/Class/Import/Typo3Test.php
@@ -233,6 +233,12 @@ class Import_Typo3ArticleTest extends Import_Typo3TestCase {
$this->assertContains('<img src="'.Class_Import_Typo3::BOKEH_IMG_URL.'pics/bateau.jpg" alt=""/>',$this->bateau_pirate->getContenu());
}
+ /** @test */
+ public function articleABordDuBateauPirateShouldContainsImageWithBateauInSummary() {
+ $this->assertContains('<img src="'.Class_Import_Typo3::BOKEH_IMG_URL.'pics/bateau.jpg" alt=""/>',$this->bateau_pirate->getDescription());
+ }
+
+
/** @test */
public function articleABordDuBateauPirateShouldConvertImageWithUploads() {
$this->assertContains('<img style="padding-right: 10px; padding-bottom: 10px; float: left;" src="'.Class_Import_Typo3::BOKEH_IMG_URL.'RTEmagicC_5_37.jpg.jpg" height="76" width="133" alt="" />',$this->bateau_pirate->getContenu());
--
GitLab