From 82f31fee2e8db53c01ce3b8c99996ed498f4cb14 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Mon, 26 Oct 2020 10:49:49 +0100
Subject: [PATCH] Bug 26032: (follow-up 2) show 'is new' filter only if
 items.new_status is used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Addition to test plan:
1) Apply on a database without Koha to MARC mapping on items.new_status
2Â) Check you dont see the 'is new' filter in items search form
---
 catalogue/itemsearch.pl                                       | 4 ++++
 .../intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt     | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl
index 2ea32156ac..f5f66fe349 100755
--- a/catalogue/itemsearch.pl
+++ b/catalogue/itemsearch.pl
@@ -102,6 +102,10 @@ my $itemlost_values = $mss->count ? GetAuthorisedValues($mss->next->authorised_v
 $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => '', kohafield => 'items.withdrawn', authorised_value => [ -and => {'!=' => undef }, {'!=' => ''}] });
 my $withdrawn_values = $mss->count ? GetAuthorisedValues($mss->next->authorised_value) : [];
 
+if ( Koha::MarcSubfieldStructures->search( { frameworkcode => '', kohafield => 'items.new_status' } )->count ) {
+    $template->param( has_new_status => 1 );
+}
+
 if (scalar keys %params > 0) {
     # Parameters given, it's a search
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 22d3ca6cc9..c86b8886fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -195,7 +195,9 @@
               <span class="hint">(inclusive)</span>
             </div>
             [% INCLUDE form_field_radio_yes_no name="damaged" %]
-            [% INCLUDE form_field_radio_yes_no name="new_status" %]
+            [% IF ( has_new_status ) %]
+                [% INCLUDE form_field_radio_yes_no name="new_status" %]
+            [% END %]
             <div class="form-field">
               <label class="form-field-label" for="issues_op">Checkout count:</label>
               <select id="issues_op" name="issues_op">
-- 
2.28.0