gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 879ee53be7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
This commit is contained in:
Jonathan Druart 2016-01-20 09:40:25 +00:00 committed by Frédéric Demians
parent c769821c5a
commit c78431b17d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
circ/pendingreserves.pl
View File

@ -114,7 +114,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 '<br/>') 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
@ -187,7 +187,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})],
}
);

6
koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
View File

@ -134,7 +134,11 @@ $(document).ready(function() {
<td><p>[% reserveloo.itemcallnumber %]</p></td>
<td><p>[% reserveloo.copyno %]</p></td>
<td><p>[% reserveloo.enumchron %]</p></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) %]<br>