From e09cd514d9d6e9390bd702b0ca322f13c8e20c10 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 2 Jun 2023 08:17:45 +0000
Subject: [PATCH] Bug 33247: (QA follow-up) Remove pending deletion from
 results array

Both Elastic and Zebra search_auth_compat return a hash key
authid for a result.

Test plan:
Remove an authority that should be in your results list.
Note that it is no longer marked as pending, but just not displayed.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 1f0574dd912a97f588d4e8523319f721093bdb42)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 authorities/authorities-home.pl                              | 5 ++++-
 .../prog/en/modules/authorities/searchresultlist.tt          | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index 5b4ab19bd7..e4f9bc471d 100755
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -201,6 +201,10 @@ if ( $op eq "do_search" ) {
         }
     }
 
+    if( $pending_deletion_authid && $results ) {
+        $results = [ grep { $_->{authid} != $pending_deletion_authid } @$results ];
+    }
+
     $template->param( result => $results ) if $results;
 
     my $max_result_window = $searcher->max_result_window;
@@ -241,7 +245,6 @@ my $servers = Koha::Z3950Servers->search(
 $template->param(
     servers => $servers,
     authority_types => $authority_types,
-    pending_deletion_authid => $pending_deletion_authid,
     op            => $op,
 );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
index 22cbd559b6..42826d7928 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
@@ -73,7 +73,6 @@
             [% ELSE %]
               [% PROCESS authresult summary=resul.summary authid=resul.authid %]
             [% END %]
-            [% IF pending_deletion_authid == resul.authid %]<span style="color: red;">Pending deletion</span>[% END %]
           </td>
           <td>[% resul.authtype | html %]</td>
         [% UNLESS ( resul.isEDITORS ) %]
-- 
2.39.2