Attachment 72804 Details for Bug 19972 – Bug 19972: pendingreserves.pl now honors syspref "item-level_itypes"

[patch] Bug 19972: pendingreserves.pl now honors syspref "item-level_itypes"

Bug-19972-pendingreservespl-now-honors-syspref-ite.patch (text/plain), 5.37 KB, created by Biblibre Sandboxes on 2018-03-13 16:04:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Biblibre Sandboxes

Created: 2018-03-13 16:04:34 UTC

Size: 5.37 KB

patch

obsolete

>From ff00e8fa2949d8835d3ae5933750dcb98e9751bb Mon Sep 17 00:00:00 2001
>From: Victor Grousset <victor.grousset@biblibre.com>
>Date: Tue, 16 Jan 2018 10:06:20 +0100
>Subject: [PATCH] Bug 19972: pendingreserves.pl now honors syspref
> "item-level_itypes"
>
>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 <lucie.gay@ens-paris-saclay.fr>
>---
> 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 1587320..6c9a0cf 100755
>--- a/circ/pendingreserves.pl
>+++ b/circ/pendingreserves.pl
>@@ -89,6 +89,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.borrowernumber as borrowernumber,
>@@ -96,8 +98,8 @@ my $strsth =
>                     ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
>             reserves.biblionumber,
>             reserves.branchcode as l_branch,
>-            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 
>@@ -115,6 +117,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
>@@ -165,7 +168,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})],
>         }
>     );
>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 b706e8f..4ba0e01 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -40,7 +40,7 @@
>         <th>Available call numbers</th>
>         <th>Available copy numbers</th>
>         <th>Available enumeration</th>
>-        <th class="string-sort">Available itypes</th>
>+        <th class="string-sort">Available item types</th>
>         <th class="string-sort">Available locations</th>
>         <th class="title-string">Earliest hold date</th>
>         </tr>
>@@ -75,8 +75,8 @@
>         <td><p>[% reserveloo.copyno %]</p></td>
>         <td><p>[% reserveloo.enumchron %]</p></td>
>         <td>
>-        [% FOREACH itype IN reserveloo.itypes %]
>-            [% ItemTypes.GetDescription( itype ) %]
>+        [% FOREACH itemType IN reserveloo.itemTypes %]
>+            [% ItemTypes.GetDescription( itemType ) %]
>         [% END %]
>         </td>
>         <td>
>@@ -101,7 +101,7 @@
>         <td><input type="text" class="filter" data-column_num="6" placeholder="Call number" style="width:95%"/></td>
>         <td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
>         <td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
>-        <td id="itypefilter"></td>
>+        <td id="type-filter"></td>
>         <td id="locationfilter"></td>
>         <td></td>
>         </tr>
>@@ -196,7 +196,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

Actions: View | Diff | Splinter Review

Attachments on bug 19972: 70549 | 72804 | 74706 | 74707 | 74878 | 74879