Skip to content
Snippets Groups Projects
Commit cf2f2d1d authored by Demian Katz's avatar Demian Katz
Browse files

More case adjustment.

parent 9d7354a3
No related merge requests found
<? <?
$tabConfig = is_object($this->params) $tabConfig = is_object($this->params)
? $this->searchtabs()->getTabConfigForParams($this->params) : []; ? $this->searchTabs()->getTabConfigForParams($this->params) : [];
?> ?>
<? if (count($tabConfig) > 0): ?> <? if (count($tabConfig) > 0): ?>
<div class="alert alert-info"> <div class="alert alert-info">
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
$hiddenFilters = $this->saved->getParams()->getHiddenFilters(); $hiddenFilters = $this->saved->getParams()->getHiddenFilters();
} else { } else {
$hasDefaultsApplied = $searchDetails = $searchFilters = $groups = false; $hasDefaultsApplied = $searchDetails = $searchFilters = $groups = false;
$hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, true); $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId, true);
} }
// Step 1: Load the javascript // Step 1: Load the javascript
......
...@@ -18,16 +18,16 @@ ...@@ -18,16 +18,16 @@
$lastLimit = $this->searchMemory()->getLastLimit($this->searchClassId); $lastLimit = $this->searchMemory()->getLastLimit($this->searchClassId);
$ignoreHiddenFilterMemory = isset($this->ignoreHiddenFilterMemory) && $this->ignoreHiddenFilterMemory; $ignoreHiddenFilterMemory = isset($this->ignoreHiddenFilterMemory) && $this->ignoreHiddenFilterMemory;
$ignoreHiddenFiltersInRequest = isset($this->ignoreHiddenFiltersInRequest) && $this->ignoreHiddenFiltersInRequest; $ignoreHiddenFiltersInRequest = isset($this->ignoreHiddenFiltersInRequest) && $this->ignoreHiddenFiltersInRequest;
$hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory, $ignoreHiddenFiltersInRequest); $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory, $ignoreHiddenFiltersInRequest);
if (empty($hiddenFilters) && !$ignoreHiddenFilterMemory) { if (empty($hiddenFilters) && !$ignoreHiddenFilterMemory) {
$hiddenFilters = $this->searchMemory()->getLastHiddenFilters($this->searchClassId); $hiddenFilters = $this->searchMemory()->getLastHiddenFilters($this->searchClassId);
if (empty($hiddenFilters)) { if (empty($hiddenFilters)) {
$hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId); $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId);
} }
} }
$hiddenFilterParams = $this->searchtabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?'); $hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?');
?> ?>
<? $tabConfig = $this->searchtabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?> <? $tabConfig = $this->searchTabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?>
<? if ($this->searchType == 'advanced'): ?> <? if ($this->searchType == 'advanced'): ?>
<div class="navbar-form navbar-left flip"> <div class="navbar-form navbar-left flip">
<? $tabs = $this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $tabConfig['tabs']]); ?> <? $tabs = $this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $tabConfig['tabs']]); ?>
......
...@@ -36,7 +36,7 @@ return [ ...@@ -36,7 +36,7 @@ return [
'searchMemory' => 'VuFind\View\Helper\Root\Factory::getSearchMemory', 'searchMemory' => 'VuFind\View\Helper\Root\Factory::getSearchMemory',
'searchOptions' => 'VuFind\View\Helper\Root\Factory::getSearchOptions', 'searchOptions' => 'VuFind\View\Helper\Root\Factory::getSearchOptions',
'searchParams' => 'VuFind\View\Helper\Root\Factory::getSearchParams', 'searchParams' => 'VuFind\View\Helper\Root\Factory::getSearchParams',
'searchtabs' => 'VuFind\View\Helper\Root\Factory::getSearchTabs', 'searchTabs' => 'VuFind\View\Helper\Root\Factory::getSearchTabs',
'summaries' => 'VuFind\View\Helper\Root\Factory::getSummaries', 'summaries' => 'VuFind\View\Helper\Root\Factory::getSummaries',
'syndeticsPlus' => 'VuFind\View\Helper\Root\Factory::getSyndeticsPlus', 'syndeticsPlus' => 'VuFind\View\Helper\Root\Factory::getSyndeticsPlus',
'systemEmail' => 'VuFind\View\Helper\Root\Factory::getSystemEmail', 'systemEmail' => 'VuFind\View\Helper\Root\Factory::getSystemEmail',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment