From ce90146c59000d45aee7d379e260727a99568755 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 28 Oct 2022 14:43:10 +0000
Subject: [PATCH] Bug 32037: Check for existence of object before building link

This patch adds a check on the existence of the object and passes this to the template

I also drop a level of IF by moving to ELSIF

To test:
 1 - Enable ReturnLog amd IssueLog
 2 - Checkout an item to a patron
 3 - Return it
 4 - View 'Modification log' tab of the borrwer
 5 - Note item links, test them, they work
 6 - Delete the item
 7 - Reload and try links again, they do not work
 8 - Apply patch
 9 - Reload, no more links
10 - Checkout and return another item
11 - This one has links, and they work as before

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../prog/en/modules/tools/viewlog.tt          | 30 +++++++++----------
 tools/viewlog.pl                              |  1 +
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index ac37c1996d..9bf9f915e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -391,24 +391,22 @@
                                         [% END %]
                                     </td>
                                     <td>
-                                        [% IF ( loopro.module == 'CIRCULATION' ) %]
+                                        [% IF ( loopro.module == 'CIRCULATION' && loopro.object_found ) %]
                                             <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info | uri %]&amp;biblionumber=[% loopro.biblionumber | uri %]&amp;bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.info | uri %]" title="Display detail for this item">Item [% loopro.barcode | html %]</a>
+                                        [% ELSIF loopro.module == "SYSTEMPREFERENCE" || loopro.module == "REPORTS" || loopro.module == "NEWS" %]
+                                            <div class="loginfo" id="loginfo[% loopro.action_id | html %]">[% loopro.info | trim | html %]</div>
+                                            <div class="compare_info" id="compare_info[% loopro.action_id | html %]">
+                                                <label><input type="checkbox" name="diff" id="action_id[% loopro.action_id | html %]" data-actionid="[% loopro.action_id | html %]" data-filter="[% FOREACH info IN loopro.info.split(' \| ') %][% IF loop.first %][% info | html %][% END %][% END %]" class="compare" /> Compare</label>
+                                            </div>
+                                        [% ELSIF loopro.module == "NOTICES" %]
+                                            <div class="loginfo" id="loginfo[% loopro.action_id | html %]">[% loopro.info | trim | html %]</div>
+                                            <div class="compare_info" id="compare_info[% loopro.action_id | html %]">
+                                                <label><input type="checkbox" name="diff" id="action_id[% loopro.action_id | html %]" data-actionid="[% loopro.action_id | html %]" data-filter="[% IF loopro.notice %][% loopro.notice.title | html %][% ELSE %][% loopro.object | html %][% END %]" class="compare" /> Compare</label>
+                                            </div>
                                         [% ELSE %]
-                                            [% IF loopro.module == "SYSTEMPREFERENCE" || loopro.module == "REPORTS" || loopro.module == "NEWS" %]
-                                                <div class="loginfo" id="loginfo[% loopro.action_id | html %]">[% loopro.info | trim | html %]</div>
-                                                <div class="compare_info" id="compare_info[% loopro.action_id | html %]">
-                                                    <label><input type="checkbox" name="diff" id="action_id[% loopro.action_id | html %]" data-actionid="[% loopro.action_id | html %]" data-filter="[% FOREACH info IN loopro.info.split(' \| ') %][% IF loop.first %][% info | html %][% END %][% END %]" class="compare" /> Compare</label>
-                                                </div>
-                                            [% ELSIF loopro.module == "NOTICES" %]
-                                                <div class="loginfo" id="loginfo[% loopro.action_id | html %]">[% loopro.info | trim | html %]</div>
-                                                <div class="compare_info" id="compare_info[% loopro.action_id | html %]">
-                                                    <label><input type="checkbox" name="diff" id="action_id[% loopro.action_id | html %]" data-actionid="[% loopro.action_id | html %]" data-filter="[% IF loopro.notice %][% loopro.notice.title | html %][% ELSE %][% loopro.object | html %][% END %]" class="compare" /> Compare</label>
-                                                </div>
-                                            [% ELSE %]
-                                                <div class="loginfo" id="loginfo[% loopro.action_id | html %]">
-                                                    [% loopro.info | html %]
-                                                </div>
-                                            [% END %]
+                                            <div class="loginfo" id="loginfo[% loopro.action_id | html %]">
+                                                [% loopro.info | html %]
+                                            </div>
                                         [% END %]
                                     </td>
                                     <td>[% PROCESS translate_log_interface log_interface=loopro.interface %]</td>
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 49eeb5decc..9db4e430ed 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -157,6 +157,7 @@ if ($do_it) {
             $itemnumber = $log->info if ( $log->module eq "CIRCULATION" );
             my $item = Koha::Items->find($itemnumber);
             if ($item) {
+                $result->{'object_found'}     = 1;
                 $result->{'biblionumber'}     = $item->biblionumber;
                 $result->{'biblioitemnumber'} = $item->biblionumber;
                 $result->{'barcode'}          = $item->barcode;
-- 
2.30.2