diff --git a/application/modules/opac/controllers/RechercheController.php b/application/modules/opac/controllers/RechercheController.php index ff79f1ba4a70620e55032d4970f860c601bacfc4..9e146bfdba0ca29aa8eabd5223d00d97a73f9808 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 aeb570944e7b28c2c70ff8d3c738aec1ffabea04..15bc5a09bec54d168ee1e1b18efac7cc9f24a6f0 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 baef0479885b97757fd3c2ccd4be89d2cfc9823d..7d8d0e6357e4b85605565cccadf0b37d8de445a2 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 23de653d7ba5dd927a43908e3f408ed15b3b99b6..08eaa637a3ce2b13ab4e57acc4bd816b04a0c098 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 628f76f335c8fe08b5e164699f8d49446f529201..124c33ad7d34f1de83b4d35e71bef8fb0de897ad 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); }