From 0d232492a2a2feb997b0c2ab38dd3957ccb3821c Mon Sep 17 00:00:00 2001 From: Curtis Conard Date: Thu, 7 Dec 2023 17:48:05 -0500 Subject: [PATCH] handle corrupt saved searches --- src/SavedSearch.php | 5 ++++ .../parts/saved_searches_list.html.twig | 24 ++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/SavedSearch.php b/src/SavedSearch.php index 1f947a3fa212..9b5523168d1b 100644 --- a/src/SavedSearch.php +++ b/src/SavedSearch.php @@ -868,6 +868,11 @@ public function getMine(string $itemtype = null, bool $inverse = false, bool $en } catch (\RuntimeException $e) { ErrorHandler::getInstance()->handleException($e); $search_data = false; + } catch (\Throwable $e) { + ErrorHandler::getInstance()->handleException($e); + $info_message = __s('A fatal error occurred while executing this saved search. It is not able to be used.'); + $count = ""; + $data['_error'] = true; } if (isset($search_data['data']['totalcount'])) { $count = $search_data['data']['totalcount']; diff --git a/templates/layout/parts/saved_searches_list.html.twig b/templates/layout/parts/saved_searches_list.html.twig index cc4bd957f9dd..a6f43f61d546 100644 --- a/templates/layout/parts/saved_searches_list.html.twig +++ b/templates/layout/parts/saved_searches_list.html.twig @@ -41,15 +41,23 @@ {% for search in saved_searches %}
- - {{ search['name']|verbatim_value }} - + {% if search['_error'] is not defined or search['_error'] == false %} + + {{ search['name']|verbatim_value }} + + {% else %} + + {{ search['name']|verbatim_value }} + + {% endif %}
- + {% if search['_error'] is not defined or search['_error'] == false %} + + {% endif %}
{% if search['is_private'] == 1 %}