Bug 20341: Use AuthorisedValues plugin on the staff side

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 704c595..b29d858 100755 (executable)
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -203,20 +203,7 @@ my $copynumbers =
 my (@itemloop, @otheritemloop, %itemfields);
 my $norequests = 1;
 
-my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.itemlost', authorised_value => { not => undef } });
-if ( $mss->count ) {
-    $template->param( itemlostloop => GetAuthorisedValues( $mss->next->authorised_value ) );
-}
-$mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.damaged', authorised_value => { not => undef } });
-if ( $mss->count ) {
-    $template->param( itemdamagedloop => GetAuthorisedValues( $mss->next->authorised_value ) );
-}
-$mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.withdrawn', authorised_value => { not => undef } });
-if ( $mss->count ) {
-    $template->param( itemwithdrawnloop => GetAuthorisedValues( $mss->next->authorised_value) );
-}
-
-$mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.materials', authorised_value => { not => undef } });
+my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.materials', authorised_value => { not => undef } });
 my %materials_map;
 if ($mss->count) {
     my $materials_authvals = GetAuthorisedValues($mss->next->authorised_value);

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index d3b12b4..635781b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -393,37 +393,28 @@
                             <span class="intransit">In transit from [% Branches.GetName( item.transfertfrom ) %] to [% Branches.GetName( item.transfertto ) %] since [% item.transfertwhen | $KohaDates %]</span>
                         [% END %]
 
+                        [% itemlost_desc = AuthorisedValues.GetByCode( 'LOST', item.itemlost ) %]
                         [% IF ( item.itemlost ) %]
-                            [% IF itemlostloop %]
-                                [% FOREACH itemlostloo IN itemlostloop %]
-                                    [% IF itemlostloo.authorised_value == item.itemlost %]
-                                        <span class="lost">[% itemlostloo.lib %]</span>
-                                    [% END %]
-                                [% END %]
+                            [% IF itemlost_desc %]
+                                <span class="lost">[% itemlost_desc %]</span>
                             [% ELSE %]
                                 <span class="lost">Unavailable (lost or missing)</span>
                             [% END %]
                         [% END %]
 
+                        [% withdrawn_desc = AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn ) %]
                         [% IF ( item.withdrawn ) %]
-                            [% IF itemwithdrawnloop %]
-                                [% FOREACH itemwithdrawnloo IN itemwithdrawnloop %]
-                                    [% IF itemwithdrawnloo.authorised_value == item.withdrawn %]
-                                        <span class="wdn">[% itemwithdrawnloo.lib %]</span>
-                                    [% END %]
-                                [% END %]
+                            [% IF withdrawn_desc %]
+                                <span class="wdn">[% withdrawn_desc %]</span>
                             [% ELSE %]
                                 <span class="wdn">Withdrawn</span>
                             [% END %]
                         [% END %]
 
+                        [% damaged_desc = AuthorisedValues.GetByCode( 'DAMAGED', item.damaged ) %]
                         [% IF ( item.damaged ) %]
-                            [% IF itemdamagedloop %]
-                                [% FOREACH itemdamagedloo IN itemdamagedloop %]
-                                    [% IF itemdamagedloo.authorised_value == item.damaged %]
-                                        <span class="dmg">[% itemdamagedloo.lib %]</span>
-                                    [% END %]
-                                [% END %]
+                            [% IF damaged_desc %]
+                                <span class="dmg">[% damaged_desc %]</span>
                             [% ELSE %]
                                 <span class="dmg">Damaged</span>
                             [% END %]