From cb3f24d836278f4604867a16510253815e13ff52 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 25 Feb 2021 15:48:39 +0000
Subject: [PATCH] Bug 14233: (QA follow-up) Fix filtering issue

As highlighted by David, the filtering was broken for the case where a
notice had been deleted. This patch resolves that issue and also adds in
the 'Log not enabled' display when the logs are not enabled.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 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 c36dc7354a..d25ca1cf70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -96,7 +96,7 @@
 
 [%        CASE 'SEARCHENGINE' %]Search engine
 
-[%        CASE 'NOTICES'      %]Notices
+[%        CASE 'NOTICES'      %]Notices[% UNLESS Koha.Preference('NoticesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
 [%        CASE %][% module | html %]
 [%    END %]
 [% END %]
@@ -343,7 +343,7 @@
                                             [% 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="[% loopro.notice.title | html %]" class="compare" /> Compare</label>
+                                                    <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 %][% END %]" class="compare" /> Compare</label>
                                                 </div>
                                             [% ELSE %]
                                                 <div class="loginfo" id="loginfo[% loopro.action_id | html %]">
-- 
2.24.1 (Apple Git-126)