From 8bd6d74471d097b3ef1b3232c88245c315bd685a Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Thu, 29 Mar 2018 09:20:53 +0200
Subject: [PATCH] hotline #73332 revert fix from 72999
---
VERSIONS_HOTLINE/73332 | 2 ++
library/ZendAfi/View/Helper/Accueil/Base.php | 7 ++++---
library/ZendAfi/View/Helper/Accueil/Library.php | 3 ++-
tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php | 8 --------
4 files changed, 8 insertions(+), 12 deletions(-)
create mode 100644 VERSIONS_HOTLINE/73332
diff --git a/VERSIONS_HOTLINE/73332 b/VERSIONS_HOTLINE/73332
new file mode 100644
index 00000000000..67621faf677
--- /dev/null
+++ b/VERSIONS_HOTLINE/73332
@@ -0,0 +1,2 @@
+ - ticket #73332 : Boite agenda : correction des liens du calendrier et des filtres.
+
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Accueil/Base.php b/library/ZendAfi/View/Helper/Accueil/Base.php
index 536f179c7dc..74f50efdecd 100644
--- a/library/ZendAfi/View/Helper/Accueil/Base.php
+++ b/library/ZendAfi/View/Helper/Accueil/Base.php
@@ -426,9 +426,10 @@ class ZendAfi_View_Helper_Accueil_Base extends ZendAfi_View_Helper_ModuleAbstrac
$instance = Class_ScriptLoader::getInstance();
$tabs_css = Class_Url::baseUrl() . '/public/opac/js/renderFilters/tabs.css';
- if(null == $filter_settings)
- $filter_settings = (new Class_Entity())
- ->whenCalledDo('isDisplayModeList', function() {return false;});
+ if(null == $filter_settings) {
+ $instance->addStyleSheet($tabs_css);
+ return $this;
+ }
$opts = ($onLoadComplete = $filter_settings->getOnLoadComplete())
? '{onLoadComplete: function(widget){ '. $onLoadComplete .' }}'
diff --git a/library/ZendAfi/View/Helper/Accueil/Library.php b/library/ZendAfi/View/Helper/Accueil/Library.php
index 5e16582cc25..2295cd2aee1 100644
--- a/library/ZendAfi/View/Helper/Accueil/Library.php
+++ b/library/ZendAfi/View/Helper/Accueil/Library.php
@@ -224,7 +224,8 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
protected function _renderFilters() {
- $this->_filters = array_filter(explode(';', $this->preferences['filters']));
+ if(!$this->_filters = array_filter(explode(';', $this->preferences['filters'])))
+ return '';
$this->_filter_settings = new Class_FilterSettings(new Class_Systeme_ModulesAccueil_Library());
$this->_filter_settings
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php b/tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php
index e2ec4d9ed62..8267dae8d37 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/LibraryTest.php
@@ -108,14 +108,6 @@ class ZendAfi_View_Helper_Accueil_LibrarySelectedLibrariesTest extends ZendAfi_V
public function cranShouldNotBeDisplayed() {
$this->assertNotXPathContentContains($this->html, '//section/h2', 'Cran');
}
-
-
- /** @test */
- public function jQueryReadyShouldContainsAjaxifyFilters() {
- $js = Class_ScriptLoader::getInstance()->javaScriptsHTML();
- $this->assertContains('$("#boite_2").ajaxifyFilters({});',
- $js);
- }
}
--
GitLab