Attachment 112502 Details for Bug 26032 – Bug 26032: (follow-up 2) show 'is new' filter only if items.new_status is used

[patch] Bug 26032: (follow-up 2) show 'is new' filter only if items.new_status is used

Bug-26032-follow-up-2-show-is-new-filter-only-if-i.patch (text/plain), 2.84 KB, created by Fridolin Somers on 2020-10-26 10:08:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fridolin Somers

Created: 2020-10-26 10:08:35 UTC

Size: 2.84 KB

patch

obsolete

>From e47488c298e407bc4c4517d52a8baeba3edb7031 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
>
>Also adds a class 'item-new-status' to this filter to be able to hidde
>even if items.new_status used.
>
>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
>3) Apply on a database with Koha to MARC mapping on items.new_status
>4) Check you see class 'form-field item-new-status'
>---
> catalogue/itemsearch.pl                                     | 4 ++++
> .../intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt   | 6 ++++--
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
>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..91726573d7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>@@ -90,7 +90,7 @@
> [% END %]
> 
> [% BLOCK form_field_radio_yes_no %]
>-  <div class="form-field">
>+  <div class="form-field [% divclass | html %]">
>     <label class="form-field-label">[% INCLUDE form_label label=name %]:</label>
>     <input type="radio" name="[% name | html %]" id="[% name | html %]_indifferent" value="" checked="checked"/>
>     <label for="[% name | html %]_indifferent">Ignore</label>
>@@ -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" divclass='item-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

Actions: View | Diff | Splinter Review

Attachments on bug 26032: 107141 | 107142 | 111554 | 111555 | 111834 | 111961 | 111962 | 111963 | 112500 | 112501 | 112502 | 112707 | 112708 | 112709 | 112710 | 112809 | 112810 | 112811 | 112812 | 112915 | 112916 | 112917 | 112918