From eaa5a1e12e73b05ae6d11287b27b992fe1daabff Mon Sep 17 00:00:00 2001
From: lbrun <leo@sandbox.pergame.net>
Date: Thu, 3 Dec 2015 17:50:21 +0100
Subject: [PATCH] dev#25892_module_de_demande_de_consultation_sur_place : fix
tests
---
.../modules/opac/controllers/RechercheController.php | 3 ++-
library/Class/Exemplaire.php | 6 ++++--
library/ZendAfi/View/Helper/Notice/ConsultationLink.php | 2 +-
library/ZendAfi/View/Helper/Notice/ReservationLink.php | 2 +-
.../library/ZendAfi/View/Helper/Notice/ExemplairesTest.php | 4 ++--
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/application/modules/opac/controllers/RechercheController.php b/application/modules/opac/controllers/RechercheController.php
index ff79f1ba4a7..9e146bfdba0 100644
--- a/application/modules/opac/controllers/RechercheController.php
+++ b/application/modules/opac/controllers/RechercheController.php
@@ -685,7 +685,8 @@ class RechercheController extends ZendAfi_Controller_Action {
public function reservationPickupAjaxAction() {
- if (!$this->userConnected());
+ if (!$this->userConnected())
+ return ;
if (!Class_CosmoVar::isSiteRetraitResaChoiceEnabled()
&& !$this->arePickupLocationsProvidedByComm()) {
diff --git a/library/Class/Exemplaire.php b/library/Class/Exemplaire.php
index aeb570944e7..15bc5a09bec 100644
--- a/library/Class/Exemplaire.php
+++ b/library/Class/Exemplaire.php
@@ -284,8 +284,10 @@ class Class_Exemplaire extends Storm_Model_Abstract {
public function getCodeAnnexe() {
- xdebug_break();
- return $this->getSigbExemplaire()->getCodeAnnexe();
+
+ if ($code_annexe=$this->getSigbExemplaire()->getCodeAnnexe())
+ return $code_annexe;
+ return $this->annexe;
}
public function getNbResas() {
diff --git a/library/ZendAfi/View/Helper/Notice/ConsultationLink.php b/library/ZendAfi/View/Helper/Notice/ConsultationLink.php
index baef0479885..7d8d0e6357e 100644
--- a/library/ZendAfi/View/Helper/Notice/ConsultationLink.php
+++ b/library/ZendAfi/View/Helper/Notice/ConsultationLink.php
@@ -59,7 +59,7 @@ class ZendAfi_View_Helper_Notice_ConsultationLink extends ZendAfi_View_Helper_Ba
'action' => 'consultation-pickup-ajax',
'id_int_bib' => $ex->getIdIntBib(),
'id_bib' => $ex->getIdBib(),
- 'id_origine' => $ex->getIdOrigine(),
+ 'id_origine' => $ex->getId(),
'code_annexe' => $ex->getCodeAnnexe()
]);
diff --git a/library/ZendAfi/View/Helper/Notice/ReservationLink.php b/library/ZendAfi/View/Helper/Notice/ReservationLink.php
index 23de653d7ba..08eaa637a3c 100644
--- a/library/ZendAfi/View/Helper/Notice/ReservationLink.php
+++ b/library/ZendAfi/View/Helper/Notice/ReservationLink.php
@@ -80,7 +80,7 @@ class ZendAfi_View_Helper_Notice_ReservationLink extends ZendAfi_View_Helper_Bas
'action' => 'reservation-pickup-ajax',
'id_int_bib' => $ex->getIdIntBib(),
'id_bib' => $ex->getIdBib(),
- 'id_origine' => $ex->getIdOrigine(),
+ 'id_origine' => $ex->getId(),
'code_annexe' => $ex->getCodeAnnexe()]);
return $this->_tag('a', $this->_getHoldImage(), ['href' => $link,
diff --git a/tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php b/tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php
index 628f76f335c..124c33ad7d3 100644
--- a/tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php
+++ b/tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php
@@ -219,7 +219,6 @@ abstract class NoticeHtmlGetExemplairesWithOneExemplaireAndWebServiceTestCase ex
'id_notice' => '24765',
'id_origine' => '666',
'annexe' => 'MOUL',
- 'count(*)' => 2, //???
'cote' => 'DSEM',
'dispo' => "Disponible",
'code_barres' => "12345",
@@ -252,7 +251,8 @@ extends NoticeHtmlGetExemplairesWithOneExemplaireAndWebServiceTestCase {
/** @test */
public function reservationLinkShouldBePopup() {
$this->assertXPath($this->html,
- '//a[@data-popup="true"][contains(@href, "recherche/reservation-pickup-ajax/id_int_bib/1/id_bib/4/id_origine/12/code_annexe/MOUL")]');
+ '//a[@data-popup="true"][contains(@href, "recherche/reservation-pickup-ajax/id_int_bib/1/id_bib/4/id_origine/12/code_annexe/MOUL")]',
+ $this->html);
}
--
GitLab