diff --git a/VERSIONS b/VERSIONS index 945fe3889b29ed89ec9fd6fc19a1bcf185096d11..e9546ac42f9843473b58d6c19660bd4e84720cce 100644 --- a/VERSIONS +++ b/VERSIONS @@ -1,3 +1,10 @@ +02/10/2017 - v7.11.3 + + - ticket #65353 : Correction du lien réserver. + + - ticket #63046 : Mise à jour du client Redmine (forge / demandes d'assistance ) qui n'était pas compatible PHP 7 + + 27/09/2017 - v7.11.2 - ticket #65212 : Les vignettes ne sont plus dupliquées dans le cache local de Bokeh @@ -5,9 +12,7 @@ - ticket #65395 : Administration : correction de la validation des boites. - 27/09/2017 - v7.11.1 - - ticket #64357 : Correction des problèmes d'affichage sur tablette Apple des popups - ticket #65092 : Administration : correction de l'affichage des boutons de gestion de la vignette d'une notice. diff --git a/library/Redmine b/library/Redmine index c6b073270e243f72aac0d164654cd39f25b5a7bf..aa9ad2e6d18789d6cb76ba848b04a2e34ee4dcff 160000 --- a/library/Redmine +++ b/library/Redmine @@ -1 +1 @@ -Subproject commit c6b073270e243f72aac0d164654cd39f25b5a7bf +Subproject commit aa9ad2e6d18789d6cb76ba848b04a2e34ee4dcff diff --git a/library/ZendAfi/View/Helper/Notice/LienReserver.php b/library/ZendAfi/View/Helper/Notice/LienReserver.php index c0ef27a07d3ae79df0832e4b717730f61c21735f..77d2417e59d2f2f15b88b53c705b71aee434f728 100644 --- a/library/ZendAfi/View/Helper/Notice/LienReserver.php +++ b/library/ZendAfi/View/Helper/Notice/LienReserver.php @@ -40,8 +40,7 @@ class ZendAfi_View_Helper_Notice_LienReserver extends Zend_View_Helper_HtmlEleme $titre = str_replace(['\'','"'], ['\\\'',''], $notice->getTitrePrincipal()); $link = $this->view->tagAnchor('#', $this->view->_('Réserver'), - ['data-popup' => 'true', - 'onclick' => + ['onclick' => "openDialogExemplaires('" . $titre . "','" . $url . "', $(this));return false;", diff --git a/library/startup.php b/library/startup.php index 9a66b298a099e4d0004d4b319de00b40903e24b0..92543a5e2da8249a14983446f93ec4ac94311be8 100644 --- a/library/startup.php +++ b/library/startup.php @@ -82,7 +82,7 @@ class Bokeh_Engine { function setupConstants() { defineConstant('BOKEH_MAJOR_VERSION','7.11'); - defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.2'); + defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.3'); defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/'); diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php index 748056e7ee8eaa39257d1af8e6ae1f4a948b8f1f..f6dba58bc10c6565e10392a9d771c59c932b1729 100644 --- a/tests/application/modules/opac/controllers/RechercheControllerTest.php +++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php @@ -486,7 +486,7 @@ class RechercheControllerViewNoticeWithPreferencesTest extends RechercheControll /** @test */ public function linkReserverShouldBeDisplayed() { - $this->assertXPathContentContains('//a[contains(@onclick, "openDialogExemplaires")]', 'Réserver'); + $this->assertXPathContentContains('//a[contains(@onclick, "openDialogExemplaires")][not(@data-popup)]', 'Réserver'); }