From dc4183552193e5c36a3f2e048acf92db133f9cea Mon Sep 17 00:00:00 2001 From: Victor Grousset Date: Tue, 16 Jan 2018 10:06:20 +0100 Subject: [PATCH] Bug 19972: Make holds to pull list honors item-level_itypes syspref And reflect that in the UI strings + variable names Test plan: 1. Set syspref "item-level_itypes" to "specific item" 2. Create a hold on a record with one item 3. Change the document type of the item 4. Check that the item edition page and the record page show 2 different types. 5. Go to /cgi-bin/koha/circ/pendingreserves.pl 6. Check that the displayed type is the item one 7. Set syspref "item-level_itypes" to "biblio record" 8. Go to /cgi-bin/koha/circ/pendingreserves.pl 9. See that the displayed type is the item one. When the sysopref says "record" This is the bug. 10. Apply this patch 11. Go to /cgi-bin/koha/circ/pendingreserves.pl 12. See that the displayed type now follows the syspref 13. Set syspref "item-level_itypes" to "specific item" 14. Go to /cgi-bin/koha/circ/pendingreserves.pl 15. See that the displayed type still follows the syspref Signed-off-by: Lucie Gay Signed-off-by: Katrin Fischer --- circ/pendingreserves.pl | 9 ++++++--- .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 5e6418b..2602daf 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -168,6 +168,8 @@ if ($enddate_iso) { push @query_params, $enddate_iso; } +my $item_type = C4::Context->preference('item-level_itypes') ? "items.itype" : "biblioitems.itemtype"; + my $strsth = "SELECT min(reservedate) as l_reservedate, reserves.reserve_id, @@ -180,8 +182,8 @@ my $strsth = reserves.itemnumber, items.holdingbranch, items.homebranch, - GROUP_CONCAT(DISTINCT items.itype - ORDER BY items.itemnumber SEPARATOR '|') l_itype, + GROUP_CONCAT(DISTINCT $item_type + ORDER BY items.itemnumber SEPARATOR '|') l_item_type, GROUP_CONCAT(DISTINCT items.location ORDER BY items.itemnumber SEPARATOR '|') l_location, GROUP_CONCAT(DISTINCT items.itemcallnumber @@ -199,6 +201,7 @@ my $strsth = FROM reserves LEFT JOIN items ON items.biblionumber=reserves.biblionumber LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber + LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber LEFT JOIN issues ON items.itemnumber=issues.itemnumber LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber @@ -249,7 +252,7 @@ while ( my $data = $sth->fetchrow_hashref ) { count => $data->{icount}, rcount => $data->{rcount}, pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount}, - itypes => [split('\|', $data->{l_itype})], + itemTypes => [split('\|', $data->{l_item_type})], locations => [split('\|', $data->{l_location})], reserve_id => $data->{reserve_id}, holdingbranch => $data->{holdingbranch}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 5072c8d..ea0eace 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -60,7 +60,7 @@ Available call numbers Available copy numbers Available enumeration - Available itypes + Available item types Available locations Earliest hold date Action @@ -96,8 +96,8 @@

[% reserveloo.copyno %]

[% reserveloo.enumchron %]

- [% FOREACH itype IN reserveloo.itypes %] - [% ItemTypes.GetDescription( itype ) %] + [% FOREACH itemType IN reserveloo.itemTypes %] + [% ItemTypes.GetDescription( itemType ) %] [% END %] @@ -149,7 +149,7 @@ - + @@ -245,7 +245,7 @@ holdst.fnFilter( filter_value, 5, true ); }); }); - $("#itypefilter").each( function () { + $("#type-filter").each( function () { $(this).html( createSelect( holdst.fnGetColumnData(9) ) ); $('select', this).change( function () { holdst.fnFilter( $(this).val(), 9 ); -- 2.7.4