The Gitlab instance will be restarted on Monday April 28th at 2AM. There will be a short interruption of service.

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

Resolving VUFIND-884 (Problems with combined search AJAX mode)

parent e29d9e17
No related merge requests found
......@@ -125,7 +125,9 @@ class CombinedController extends AbstractSearch
= explode('-', $currentOptions->getSearchAction());
$combinedResults[$current] = $settings;
$combinedResults[$current]['view']
= $this->forwardTo($controller, $action);
= (!isset($settings['ajax']) || !$settings['ajax'])
? $this->forwardTo($controller, $action)
: $this->createViewModel(array('results' => $results));
}
// Build view model:
......
......@@ -11,5 +11,5 @@
?>
<h2><?=$this->transEsc($currentSearch['label'])?></h2>
<p><?=$this->transEsc("Loading")?>... <img src="<?=$this->imageLink('ajax_loading.gif')?>" /></p>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(function(){' . $loadJs . '});')?>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$(document).ready(function(){' . $loadJs . '});', 'SET')?>
<noscript><?=$this->transEsc('Please enable JavaScript.')?></noscript>
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