From 32d99e4a48b4579e8a181d857cea72729937cb38 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Wed, 26 Mar 2014 12:30:06 +0100
Subject: [PATCH] Fix: cache server returns error in "erreur" key for thumbnail
upload
---
library/Class/WebService/AllServices.php | 2 +-
.../modules/admin/controllers/UploadControllerTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/library/Class/WebService/AllServices.php b/library/Class/WebService/AllServices.php
index 691602bcd6b..9cb76c69c6a 100644
--- a/library/Class/WebService/AllServices.php
+++ b/library/Class/WebService/AllServices.php
@@ -116,7 +116,7 @@ class Class_WebService_AllServices {
'numero' => $notice->getTomeAlpha(),
'clef_chapeau' => $notice->getClefChapeau()]));
if (self::RETOUR_SERVICE_OK != $result['statut_recherche'])
- return $result['message'];
+ return $result['erreur'];
$notice
->setUrlVignette($result['vignette'])
diff --git a/tests/application/modules/admin/controllers/UploadControllerTest.php b/tests/application/modules/admin/controllers/UploadControllerTest.php
index 7ea998441a5..2a7f695c47f 100644
--- a/tests/application/modules/admin/controllers/UploadControllerTest.php
+++ b/tests/application/modules/admin/controllers/UploadControllerTest.php
@@ -306,7 +306,7 @@ class UploadControllerVignetteNoticePostServeurCacheErrorTest extends UploadCont
Class_WebService_AllServices::setHttpClient($http_client = Storm_Test_ObjectWrapper::mock()
->whenCalled('open_url')
->answers(json_encode(['statut_recherche' => 'erreur',
- 'message' => 'Image indisponible'])));
+ 'erreur' => 'Image indisponible'])));
$this->postDispatch('/admin/upload/vignette-notice/id/12345',
--
GitLab