From 894a2bb3f9dd6b2988b25a27c1a4d0b4f4312373 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 23 Apr 2020 09:04:25 -0400 Subject: [PATCH] Bug 24279: (QA follow-up) Show values disabled with tooltips Content-Type: text/plain; charset=utf-8 Signed-off-by: Marcel de Rooy --- cataloguing/additem.pl | 3 +-- .../prog/en/modules/catalogue/moredetail.tt | 21 ++++++++++++++++----- .../prog/en/modules/cataloguing/additem.tt | 14 +++++++++++++- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 9f375370fa..d4cee2e3f0 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -171,11 +171,10 @@ sub generate_subfield_form { my %authorised_lib; # builds list, depending on authorised value... if ( $subfieldlib->{authorised_value} eq "LOST" ) { - my $ClaimReturnedLostValue = C4::Context->preference('ClaimReturnedLostValue'); + $subfield_data{IS_LOST_AV} = 1; push @authorised_values, qq{}; my $av = GetAuthorisedValues( $subfieldlib->{authorised_value} ); for my $r ( @$av ) { - next if $ClaimReturnedLostValue && $r->{authorised_value} eq $ClaimReturnedLostValue; push @authorised_values, $r->{authorised_value}; $authorised_lib{$r->{authorised_value}} = $r->{lib}; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 5e639f7385..62d08605db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -79,7 +79,7 @@ [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %] )[% END %] -
+
  1. Current location: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %] 
  2. Checkout status: @@ -104,11 +104,13 @@ - [% FOREACH itemlostloo IN itemlostloop %] - [% NEXT IF ClaimReturnedLostValue && !ITEM_DAT.itemlost && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %] - [% IF itemlostloo.authorised_value == ITEM_DAT.itemlost %] + [% IF ClaimReturnedLostValue && !ITEM_DAT.itemlost && itemlostloo.authorised_value == ClaimReturnedLostValue #Filter claims returned status from pulldown %] + [% SET add_claims_returned_tip = itemlostloo.lib %] + + [% ELSIF itemlostloo.authorised_value == ITEM_DAT.itemlost %] [% ELSE %] @@ -118,12 +120,18 @@ + [% IF add_claims_returned_tip %] + + [% END %] + [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %]

    Item has been claimed as returned.

    [% ELSE %] - + [% END %] [% ELSE %] @@ -304,6 +312,9 @@ [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 1674d43800..38b22ae343 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -166,10 +166,22 @@ [% IF aval == mv.default %] [% ELSE %] - + [% IF ite.IS_LOST_AV && aval == Koha.Preference("ClaimReturnedLostValue") %] + [% SET add_claims_returned_tip = mv.labels.$aval %] + + [% ELSE %] + + [% END %] [% END %] [% END %] + + [% IF ite.IS_LOST_AV && add_claims_returned_tip %] +   + + [% END %] [% ELSIF ( mv.type == 'text_auth' ) %] [% IF mv.readonly %] -- 2.11.0