@@ -, +, @@ I will call "desired format" for the rest of this test plan). description in both staff and OPAC. now works in the staff interface, rather than displaying "Unknown" in each tab header. correctly. in the staff inteface. --- .../prog/en/modules/suggestion/suggestion.tt | 13 +++--------- .../bootstrap/en/modules/opac-suggestions.tt | 15 ++------------ opac/opac-suggestions.pl | 10 ---------- suggestion/suggestion.pl | 23 ++++------------------ 4 files changed, 9 insertions(+), 52 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -216,9 +216,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
  • Publication place:[% place |html %]
  • Collection title:[% collectiontitle |html %]
  • Document type: - [% FOREACH itemtypeloo IN itemtypeloop %] - [% IF ( itemtypeloo.selected ) %][% itemtypeloo.description %][% END %] - [% END %] + [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', itemtype, 0 ) %]
  • [% IF ( patron_reason_loop ) %]
  • Reason for suggestion: @@ -339,12 +337,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
  • - + [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20, default=itemtype %]
  • [% IF ( patron_reason_loop ) %]
  • - + [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20 %]
  • [% IF ( branchloop ) %]
  • @@ -176,7 +165,7 @@ [% IF ( suggestions_loo.publishercode ) %] - [% suggestions_loo.publishercode |html %][% END %] [% IF ( suggestions_loo.place ) %]([% suggestions_loo.place |html %])[% END %] [% IF ( suggestions_loo.collectiontitle ) %] , [% suggestions_loo.collectiontitle |html %][% END %] - [% IF ( suggestions_loo.itemtype ) %] - [% suggestions_loo.itemtype %][% END %] + [% IF ( suggestions_loo.itemtype ) %] - [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 1 ) %][% END %]

    --- a/opac/opac-suggestions.pl +++ a/opac/opac-suggestions.pl @@ -125,15 +125,6 @@ if ( $op eq "delete_confirm" ) { exit; } map{ $_->{'branchcodesuggestedby'}=GetBranchInfo($_->{'branchcodesuggestedby'})->[0]->{'branchname'}} @$suggestions_loop; -my $supportlist=GetSupportList(); -foreach my $support(@$supportlist){ - if ($$support{'imageurl'}){ - $$support{'imageurl'}= getitemtypeimagelocation( 'opac', $$support{'imageurl'} ); - } - else { - delete $$support{'imageurl'} - } -} foreach my $suggestion(@$suggestions_loop) { if($suggestion->{'suggestedby'} == $borrowernumber) { @@ -166,7 +157,6 @@ if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) { $template->param( %$suggestion, - itemtypeloop=> $supportlist, suggestions_loop => $suggestions_loop, patron_reason_loop => $patron_reason_loop, showall => $allsuggestions, --- a/suggestion/suggestion.pl +++ a/suggestion/suggestion.pl @@ -54,14 +54,13 @@ sub Init{ sub GetCriteriumDesc{ my ($criteriumvalue,$displayby)=@_; if ($displayby =~ /status/i) { - if ( grep { /^($criteriumvalue)$/ } qw(ASKED ACCEPTED REJECTED CHECKED ORDERED AVAILABLE) ) { - return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))); - } else { - return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue) || $criteriumvalue; + unless ( grep { /$criteriumvalue/ } qw(ASKED ACCEPTED REJECTED CHECKED ORDERED AVAILABLE) ) { + return GetAuthorisedValueByCode('SUGGEST_STATUS', $criteriumvalue ) || "Unknown"; } + return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); } return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); - return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); + return GetAuthorisedValueByCode('SUGGEST_FORMAT', $criteriumvalue) || "Unknown" if ($displayby =~/itemtype/); if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); return "" unless $borr; @@ -319,20 +318,6 @@ $branchfilter=C4::Context->userenv->{'branch'} if ($onlymine && !$branchfilter); $template->param( branchloop => \@branchloop, branchfilter => $branchfilter); -# the index parameter is different for item-level itemtypes -my $supportlist = GetSupportList(); - -foreach my $support (@$supportlist) { - $$support{'selected'} = (defined $$suggestion_ref{'itemtype'}) - ? $$support{'itemtype'} eq $$suggestion_ref{'itemtype'} - : 0; - if ( $$support{'imageurl'} ) { - $$support{'imageurl'} = getitemtypeimagelocation( 'intranet', $$support{'imageurl'} ); - } else { - delete $$support{'imageurl'}; - } -} -$template->param(itemtypeloop=>$supportlist); $template->param( returnsuggestedby => $returnsuggestedby ); my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG",$$suggestion_ref{'patronreason'}); --