Display search errors correctly in combined search mode.

demiankatz · Dec 4, 2024 · 5ab565f · 5ab565f
1 parent 7da2951
commit 5ab565f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/module/VuFind/src/VuFind/Controller/AbstractSearch.php b/module/VuFind/src/VuFind/Controller/AbstractSearch.php
@@ -357,6 +357,7 @@ protected function getSearchResultsView($setupCallback = null)
         $view = $this->createViewModel();
         $config = $this->getConfig($this->getOptionsForClass()->getFacetsIni());
         $view->multiFacetsSelection = (bool)($config->Results_Settings->multiFacetsSelection ?? false);
+        $extraErrors = [];
 
         // Handle saved search requests:
         $savedId = $this->params()->fromQuery('saved', false);
@@ -427,7 +428,14 @@ protected function getSearchResultsView($setupCallback = null)
             }
 
             foreach ($results->getErrors() as $error) {
-                $this->flashMessenger()->addErrorMessage($error);
+                try {
+                    $this->flashMessenger()->addErrorMessage($error);
+                } catch (\Exception $e) {
+                    // The flash messenger will throw an exception if session writes are disabled,
+                    // which will happen in combined search AJAX requests. For that situation, we'll
+                    // pass error messages through the view model so they can still be displayed.
+                    $extraErrors[] = $error;
+                }
             }
         }
 
@@ -439,6 +447,11 @@ protected function getSearchResultsView($setupCallback = null)
         // Schedule options for footer tools
         $view->scheduleOptions = $this->getService(\VuFind\Search\History::class)->getScheduleOptions();
         $view->saveToHistory = $this->saveToHistory;
+
+        // Add extra errors, if necessary:
+        if (count($extraErrors) > 0) {
+            $view->extraErrors = $extraErrors;
+        }
         return $view;
     }
 

diff --git a/module/VuFind/src/VuFind/Controller/CombinedController.php b/module/VuFind/src/VuFind/Controller/CombinedController.php
@@ -124,6 +124,9 @@ public function resultAction()
                 'currentSearch' => $settings,
                 'domId' => 'combined_' . str_replace(':', '____', $sectionId),
             ];
+            if (!empty($settings['view']->extraErrors)) {
+                $viewParams['extraErrors'] = $settings['view']->extraErrors;
+            }
             // Initialize theme resources:
             ($this->getViewRenderer()->plugin('setupThemeResources'))(true);
             // Render content:

diff --git a/themes/bootstrap3/templates/combined/results-list.phtml b/themes/bootstrap3/templates/combined/results-list.phtml
@@ -124,6 +124,10 @@
 </div>
 <?php /* End Listing Options */ ?>
 
+<?php foreach($this->extraErrors ?? [] as $error): ?>
+  <div class="alert alert-danger"><?=$this->transEsc($error)?></div>
+<?php endforeach; ?>
+
 <?php if ($recordTotal < 1): ?>
   <p class="alert alert-danger">
     <?=$this->slot('empty-message')->get($this->translate('nohit_lookfor_html', ['%%lookfor%%' => $this->escapeHtml($lookfor)])); ?>

diff --git a/themes/bootstrap5/templates/combined/results-list.phtml b/themes/bootstrap5/templates/combined/results-list.phtml
@@ -124,6 +124,10 @@
 </div>
 <?php /* End Listing Options */ ?>
 
+<?php foreach($this->extraErrors ?? [] as $error): ?>
+  <div class="alert alert-danger"><?=$this->transEsc($error)?></div>
+<?php endforeach; ?>
+
 <?php if ($recordTotal < 1): ?>
   <p class="alert alert-danger">
     <?=$this->slot('empty-message')->get($this->translate('nohit_lookfor_html', ['%%lookfor%%' => $this->escapeHtml($lookfor)])); ?>