diff --git a/application/modules/opac/controllers/RechercheController.php b/application/modules/opac/controllers/RechercheController.php index 350fa4e78f8ad2400a8da20402bd01cd8c48e2be..f17e55d10846c1556bbb9ce6287403f9ea9eef42 100644 --- a/application/modules/opac/controllers/RechercheController.php +++ b/application/modules/opac/controllers/RechercheController.php @@ -585,8 +585,6 @@ class RechercheController extends ZendAfi_Controller_Action { if (Class_CosmoVar::isSiteRetraitResaPatronLibrary()) $code_annexe = $user->getUserIdSite(); - xdebug_break(); - $comm = new Class_CommSigb(); $ret = $comm->reserverExemplaire($id_bib, $id_origine, $code_annexe); diff --git a/cosmogramme/php/_init.php b/cosmogramme/php/_init.php index 48d15b117202f33effc375650941791d213be8ce..c7b3f3b22d2c245d5ce3b92427d902cbd1bb93c7 100644 --- a/cosmogramme/php/_init.php +++ b/cosmogramme/php/_init.php @@ -2,7 +2,7 @@ // Constantes error_reporting(E_ERROR | E_PARSE); -define("PATCH_LEVEL","245"); +define("PATCH_LEVEL","246"); define("APPLI","cosmogramme"); define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs"); diff --git a/cosmogramme/sql/patch/patch_246.php b/cosmogramme/sql/patch/patch_246.php new file mode 100644 index 0000000000000000000000000000000000000000..b17419d26ac7abbe8ced3f54fdc4368e3baadde4 --- /dev/null +++ b/cosmogramme/sql/patch/patch_246.php @@ -0,0 +1,4 @@ +<?php +Zend_Db_Table::getDefaultAdapter() + ->query("UPDATE `variables` SET commentaire='Site de retrait à la réservation', liste='0:site de l\'exemplaire\r\n1:proposer le choix\r\n2:site de l\'abonné' WHERE variables.clef='site_retrait_resa' LIMIT 1;"); +?> diff --git a/cosmogramme/sql/patch/patch_246.sql b/cosmogramme/sql/patch/patch_246.sql deleted file mode 100644 index 94250069a8761b87747531612770820753f06293..0000000000000000000000000000000000000000 --- a/cosmogramme/sql/patch/patch_246.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `variables` SET commentaire='Site de retrait à la réservation', liste='0:site de l\'exemplaire\r\n1:proposer le choix\r\n2:site de l\'abonné' WHERE variables.clef='site_retrait_resa' LIMIT 1; diff --git a/library/Class/CmsUrlTransformer.php b/library/Class/CmsUrlTransformer.php index 1e0c8b4a9bece59c9b0d7328ee3ab2dcfc74d790..e7b79d3ac5c74a4cf81f541457a35385ec70236a 100644 --- a/library/Class/CmsUrlTransformer.php +++ b/library/Class/CmsUrlTransformer.php @@ -65,8 +65,7 @@ class Class_CmsUrlTransformer { } return $contents; } - xdebug_break(); - return static::removeHost($hostname,$basedir, $contents, $replace_count); + return static::removeHost($hostname,$basedir, $contents, $replace_count); } diff --git a/tests/library/Class/WebService/SIGB/NanookTest.php b/tests/library/Class/WebService/SIGB/NanookTest.php index e21bba0a1002a553d2cccea38a80cccfcdf6408c..e0ecfa97e6fb1aab70e68340d1db4a7a0a6ba7e2 100644 --- a/tests/library/Class/WebService/SIGB/NanookTest.php +++ b/tests/library/Class/WebService/SIGB/NanookTest.php @@ -78,15 +78,11 @@ abstract class NanookTestCase extends Storm_Test_ModelTestCase { ->setServerRoot('http://localhost:8080/afi_Nanook/ilsdi/') ->setWebClient($this->_mock_web_client); - $annexe_cran = Class_CodifAnnexe::getLoader()->newInstanceWithId(3) - ->setLibelle('Annexe Cran-Gevrier') - ->setIdBib(3) - ->setCode(10); - - Storm_Test_ObjectWrapper::onLoaderOfModel('Class_CodifAnnexe') - ->whenCalled('findFirstBy')->answers(null) - ->whenCalled('findFirstBy')->with(array('id_bib' => 3))->answers($annexe_cran) - ->whenCalled('findFirstBy')->with(array('code' => 10))->answers($annexe_cran); + $this->fixture('Class_CodifAnnexe' , ['id' => 3, + 'libelle' => 'Annexe Cran-Gevrier', + 'id_bib' => 3, + 'code' => 10]); + } }