From f002fc660eb0eb6a76b888ff158f2f3c53f819e3 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Tue, 22 Sep 2015 11:52:54 +0200
Subject: [PATCH] dev #17782 merge print fusion
remove Notice::getArticleCms() that duplicates getArticle()
---
library/Class/Notice.php | 7 -------
library/Class/WebService/Vignette.php | 2 +-
library/ZendAfi/View/Helper/TagPrintLink.php | 4 ++--
tests/library/Class/NoticeTest.php | 3 +--
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index 0f932e6408e..9fd23d2bc54 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -470,13 +470,6 @@ class Class_Notice extends Storm_Model_Abstract {
return ($this->getTypeDoc() == Class_TypeDoc::SITE);
}
- public function getArticleCms() {
- if (!$this->isArticleCms())
- return null;
-
- $id = $this->getChamp856b();
- return Class_Article::find($id);
- }
public function getSite() {
if (!$this->isSite())
diff --git a/library/Class/WebService/Vignette.php b/library/Class/WebService/Vignette.php
index 2d78ebcd838..74ca6252947 100644
--- a/library/Class/WebService/Vignette.php
+++ b/library/Class/WebService/Vignette.php
@@ -267,7 +267,7 @@ class Class_WebService_Thumbnail_Provider_Article extends Class_WebService_Thumb
public function updateNotice($notice) {
- if (!$url = $notice->getArticleCms()->getFirstImageAbsoluteURL())
+ if (!$url = $notice->getArticle()->getFirstImageAbsoluteURL())
return $this->noWebThumbRecord($notice);
if(!$image = $this->getImageFactory()->newImage($url))
diff --git a/library/ZendAfi/View/Helper/TagPrintLink.php b/library/ZendAfi/View/Helper/TagPrintLink.php
index 98ea22574f1..2d7b1559eb3 100644
--- a/library/ZendAfi/View/Helper/TagPrintLink.php
+++ b/library/ZendAfi/View/Helper/TagPrintLink.php
@@ -32,9 +32,9 @@ class ZendAfi_View_Helper_TagPrintLink extends Zend_View_Helper_HtmlElement {
}
$ids = array_map(function($model) {
- return $model->getId();
+ return $model->getId();
- }, $models);
+ }, $models);
$url = $this->view->url( ['action' => 'print',
diff --git a/tests/library/Class/NoticeTest.php b/tests/library/Class/NoticeTest.php
index e2b73925754..48902b32c3b 100644
--- a/tests/library/Class/NoticeTest.php
+++ b/tests/library/Class/NoticeTest.php
@@ -85,11 +85,10 @@ class NoticeVignetteTest extends Storm_Test_ModelTestCase {
'clef_alpha' => 'SPIROU',
'url_vignette' => '',
'url_image' => '']);
- $this->_notice_article_without_thumbnails->set_subfield('856', 'b', '5');
-
$this->fixture('Class_Article',
['id' => 5,
+ 'id_notice' => 4,
'titre' => 'Je suis Spirou',
'contenu' => 'avec mon copain le <img src="marsu.jpg"> marsupilami']);
--
GitLab