diff --git a/VERSIONS_WIP/14141 b/VERSIONS_WIP/14141 new file mode 100644 index 0000000000000000000000000000000000000000..7a9e125159d69a995efbc8644f13f44a7ba3829c --- /dev/null +++ b/VERSIONS_WIP/14141 @@ -0,0 +1 @@ + - ticket #14141 : correction de l'affichage de la disponibilité calculé par la facette dans les listes de documents. \ No newline at end of file diff --git a/VERSION_HOTLINE/53250 b/VERSION_HOTLINE/53250 new file mode 100644 index 0000000000000000000000000000000000000000..8f952cecc3748efb7da4c646716a196acf9bdd27 --- /dev/null +++ b/VERSION_HOTLINE/53250 @@ -0,0 +1 @@ + - ticket #53250 : vignettes sitothèques: adaptation aux modifications d'API de Bluga.net \ No newline at end of file diff --git a/library/Bluga/Webthumb.php b/library/Bluga/Webthumb.php index cdadc39ba97e4f97e6f53fc1de5dc15aa61c8d92..1eee908b16cda4af2528b2aedc2032ffefd07ede 100755 --- a/library/Bluga/Webthumb.php +++ b/library/Bluga/Webthumb.php @@ -43,9 +43,9 @@ * Fix all the bugs and make things work with any PEAR2 adapter * * 1.7 - 02/09/2009 - Josh - * Lots of bug fixes since the last changelog entry, added failedJobs array for tracking jobs + * Lots of bug fixes since the last changelog entry, added failedJobs array for tracking jobs * that don't submit properly - * + * * 1.8 - 09/09/2009 - Josh * Bug fixes and bring PEAR2 code back in the Bluga namespace */ @@ -178,7 +178,7 @@ class Bluga_Webthumb { $request->apikey = $this->apiKey; $request->jobs = $this->jobs; $request->apiversion = $this->apiVersion; - + $payload = $request->asXml(); $response = $this->_transmitRequest($payload); @@ -389,7 +389,7 @@ class Bluga_Webthumb { if (!isset($response->headers['Content-Type'])) { throw new Exception('No Content-Type in response.'); } - if ($response->headers['Content-Type'] != 'text/xml') { + if (false === strpos($response->headers['Content-Type'], 'text/xml')) { throw new Exception('There was an error. Content-Type returned was '.$response->headers['Content-Type']."\n".$response); } @@ -479,7 +479,7 @@ class Bluga_Webthumb { $ext = 'png'; } $filename .= '.'.$ext; - } + } if (!is_null($outDir)) { $filename = "$outDir/$filename"; diff --git a/library/ZendAfi/View/Helper/ListeNotices/Abstract.php b/library/ZendAfi/View/Helper/ListeNotices/Abstract.php index fd360f5fbe081f162e8e7a11bea57f592e811306..973abdce53a37baf9b97063cf4d411059571f7d4 100644 --- a/library/ZendAfi/View/Helper/ListeNotices/Abstract.php +++ b/library/ZendAfi/View/Helper/ListeNotices/Abstract.php @@ -32,7 +32,7 @@ abstract class ZendAfi_View_Helper_ListeNotices_Abstract extends ZendAfi_View_He protected function _getDataAvailability($record) { - if(!$this->_isAllowedToDisplayAvailabilty($record)) + if(!$this->_isAllowedToDisplayAvailabiltyFromFacet($record)) return []; return ['data-availability' => $record->getAvailabilityFromFacet()]; diff --git a/tests/library/ZendAfi/View/Helper/ListeNotices/VignettesTest.php b/tests/library/ZendAfi/View/Helper/ListeNotices/VignettesTest.php index f3c7d475bf530bd819311c39babdc05d928811d2..db50507cc72627a85d87a199cb40233f9ef836dd 100644 --- a/tests/library/ZendAfi/View/Helper/ListeNotices/VignettesTest.php +++ b/tests/library/ZendAfi/View/Helper/ListeNotices/VignettesTest.php @@ -26,7 +26,7 @@ class VignettesRGAATest extends ViewHelperTestCase { public function setUp() { parent::setUp(); $this->fixture('Class_AdminVar', ['id'=>'AFFICHER_DISPONIBILITE_SUR_RECHERCHE_MODE_FACETTE', 'valeur'=>1] ); - $this->fixture('Class_AdminVar', ['id'=>'AFFICHER_DISPONIBILITE_SUR_RECHERCHE', 'valeur'=>1] ); + $this->fixture('Class_AdminVar', ['id'=>'AFFICHER_DISPONIBILITE_SUR_RECHERCHE', 'valeur'=>0] ); defineConstant('PATH_SKIN', './public/opac/skins/original/'); $helper = new ZendAfi_View_Helper_ListeNotices_Vignettes();