diff --git a/VERSIONS_HOTLINE/73332 b/VERSIONS_HOTLINE/73332 new file mode 100644 index 0000000000000000000000000000000000000000..67621faf677ad99f42ff60ca1b74e0a2cf33243d --- /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 536f179c7dc0f661d6be270c387a4edfc5860909..74f50efdecd4d62fe20d27b2b398a41e1617d5e0 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 5e16582cc25e07d0c70eb29a92a9f52ea9d56e05..2295cd2aee1bc866d9327b0ee6d6dcd48a17ee99 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 e2ec4d9ed624704131042c6daf9d6b2a3503804d..8267dae8d37f01798e5626598b4ee17447df2d56 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); - } }