From 88d93b72ff962e105a4f26b21006372c1a5b0ab2 Mon Sep 17 00:00:00 2001 From: Frank Morgner <morgnerf@ub.uni-leipzig.de> Date: Tue, 5 Feb 2019 10:33:48 +0100 Subject: [PATCH] refs #14675 - advanced search fixing case sensitive method name of view helper * view helper method aliases are case sensitive since vf5 * several fixes --- module/finc/src/finc/View/Helper/Root/SideFacet.php | 3 ++- themes/finc/templates/Recommend/SideFacets.phtml | 2 +- themes/finc/templates/search/advanced/layout.phtml | 2 +- themes/finc/theme.config.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/finc/src/finc/View/Helper/Root/SideFacet.php b/module/finc/src/finc/View/Helper/Root/SideFacet.php index d0584faa8d4..19827c21f50 100644 --- a/module/finc/src/finc/View/Helper/Root/SideFacet.php +++ b/module/finc/src/finc/View/Helper/Root/SideFacet.php @@ -29,6 +29,7 @@ */ namespace finc\View\Helper\Root; +use Zend\View\Helper\AbstractHelper; /** * Permissions view helper * @@ -39,7 +40,7 @@ namespace finc\View\Helper\Root; * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License * @link https://vufind.org/wiki/development Wiki */ -class SideFacet extends \Zend\View\Helper\AbstractHelper +class SideFacet extends AbstractHelper { /** * VuFind configuration diff --git a/themes/finc/templates/Recommend/SideFacets.phtml b/themes/finc/templates/Recommend/SideFacets.phtml index 133ee8db0ef..bb506bc67b6 100644 --- a/themes/finc/templates/Recommend/SideFacets.phtml +++ b/themes/finc/templates/Recommend/SideFacets.phtml @@ -39,7 +39,7 @@ $this->options = $options = $this->searchOptions($this->searchClassId); <? /* finc-specific line: sidefacet()->displayAllowedFacetValues ..., #7624 - CK */ /* Original line was: *//* <? $sideFacetSet = $this->recommend->getFacetSet(); $rangeFacets = $this->recommend->getAllRangeFacets(); ?> */ ?> -<? $sideFacetSet = $this->sidefacet()->displayAllowedFacetValues($this->recommend->getFacetSet()); $rangeFacets = $this->recommend->getAllRangeFacets(); ?> +<? $sideFacetSet = $this->sideFacet()->displayAllowedFacetValues($this->recommend->getFacetSet()); $rangeFacets = $this->recommend->getAllRangeFacets(); ?> <? $hierarchicalFacets = $this->recommend->getHierarchicalFacets() ?> <? $hierarchicalFacetSortOptions = $this->recommend->getHierarchicalFacetSortOptions() ?> <? if (!empty($sideFacetSet) && $results->getResultTotal() > 0): ?> diff --git a/themes/finc/templates/search/advanced/layout.phtml b/themes/finc/templates/search/advanced/layout.phtml index 1bf1f46e7ee..c88982eed2a 100644 --- a/themes/finc/templates/search/advanced/layout.phtml +++ b/themes/finc/templates/search/advanced/layout.phtml @@ -27,7 +27,7 @@ if (isset($this->saved) && is_object($this->saved)) { $hiddenFilters = $this->saved->getParams()->getHiddenFilters(); } else { $hasDefaultsApplied = $searchDetails = $searchFilters = $groups = false; - $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, true); + $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId, true); } // Step 1: Load the javascript diff --git a/themes/finc/theme.config.php b/themes/finc/theme.config.php index 0d40a70f59d..43633691325 100644 --- a/themes/finc/theme.config.php +++ b/themes/finc/theme.config.php @@ -12,7 +12,7 @@ return [ 'branchInfo' => 'finc\View\Helper\Root\BranchInfo', 'externalCatalogueLink' => 'finc\View\Helper\Root\ExternalCatalogueLink', 'interlibraryloan' => 'finc\View\Helper\Root\InterlibraryLoanLink', - 'sidefacet' => 'finc\View\Helper\Root\SideFacet', + 'sideFacet' => 'finc\View\Helper\Root\SideFacet', ], 'factories' => [ 'finc\View\Helper\Root\BranchInfo' => -- GitLab