Attachment 46982 Details for Bug 15560 – Bug 15560: Fix display of multiple item types in pending reserves report

[patch] Bug 15560: Fix display of multiple item types in pending reserves report

Bug-15560-Fix-display-of-multiple-item-types-in-pe.patch (text/plain), 2.57 KB, created by Jonathan Druart on 2016-01-20 09:41:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-01-20 09:41:51 UTC

Size: 2.57 KB

patch

obsolete

>From 6a1b4dd2222c4bfac89f62daa05b7f2d0706a60e Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 20 Jan 2016 09:40:25 +0000
>Subject: [PATCH] Bug 15560: Fix display of multiple item types in pending
> reserves report
>
>Same fix as previous patch, but for item types.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> circ/pendingreserves.pl | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 6 +++++-
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
>index d5bcbbb..932b035 100755
>--- a/circ/pendingreserves.pl
>+++ b/circ/pendingreserves.pl
>@@ -104,7 +104,7 @@ if ( $run_report ) {
> ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
> items.holdingbranch as branch,
> GROUP_CONCAT(DISTINCT items.itype 
>- ORDER BY items.itemnumber SEPARATOR ' ') l_itype,
>+ ORDER BY items.itemnumber SEPARATOR '|') l_itype,
> GROUP_CONCAT(DISTINCT items.location 
> ORDER BY items.itemnumber SEPARATOR '|') l_location,
> GROUP_CONCAT(DISTINCT items.itemcallnumber 
>@@ -177,7 +177,7 @@ if ( $run_report ) {
> count => $data->{icount},
> rcount => $data->{rcount},
> pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
>- itype => $data->{l_itype},
>+ itypes => [split('\|', $data->{l_itype})],
> 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 28cbd4f..6be57ab 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -134,7 +134,11 @@ $(document).ready(function() {
> <td>[% reserveloo.itemcallnumber %]</td>
> <td>[% reserveloo.copyno %]</td>
> <td>[% reserveloo.enumchron %]</td>
>- <td>[% ItemTypes.GetDescription( reserveloo.itype ) %]</td>
>+ <td>
>+ [% FOREACH itype IN reserveloo.itypes %]
>+ [% ItemTypes.GetDescription( itype ) %]
>+ [% END %]
>+ </td>
> <td>
> [% FOREACH loc IN reserveloo.locations %]
> [% AuthorisedValues.GetByCode('LOC', loc) %] 
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 15560: 46964 | 46967 | 46981 | 46982