From 15f9efb7bd8c14dcae58021d67c4f0fad107e41d Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 5 May 2014 00:23:19 +0000 Subject: [PATCH] Bug 9468: use new SUGGEST_FORMAT list This patch uses the new SUGGEST_FORMAT authorized value list for populating the list of suggestion item types/document types. It also improves the display by using the staff or OPAC description of the authorised value rather than the code. To test: [1] Enter a suggestion via the OPAC and select an item type (which I will call "desired format" for the rest of this test plan). [2] Verify that the saved suggestion displays the desired format description in both staff and OPAC. [3] Verify that organizing the list of suggestions by item type now works in the staff interface, rather than displaying "Unknown" in each tab header. [4] Verify that existing suggestions' desired formats are displayed correctly. [5] Verify that suggestions can have their desired format edited in the staff inteface. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../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(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 442cc25b92..547265d3d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -213,9 +213,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.translated_description %][% END %] - [% END %] + [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', itemtype, 0 ) %]
    • [% IF ( patron_reason_loop ) %]
  • Reason for suggestion: @@ -336,12 +334,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 ) %]
  • @@ -195,7 +184,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 %]

    diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl index 78b409f890..e00fd9c77e 100755 --- a/opac/opac-suggestions.pl +++ b/opac/opac-suggestions.pl @@ -151,15 +151,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) { @@ -192,7 +183,6 @@ if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) { $template->param( %$suggestion, - itemtypeloop=> $supportlist, suggestions_loop => $suggestions_loop, patron_reason_loop => $patron_reason_loop, "op_$op" => 1, diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 43834f6760..e772a2ac04 100755 --- a/suggestion/suggestion.pl +++ b/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; @@ -324,20 +323,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'}); -- 2.39.5