From fe2cb78dcc5fb7a2b21fba2d7bae9d832d1dbd77 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Thu, 9 Feb 2017 13:09:56 +0000 Subject: [PATCH] Bug 18073: Followup - don't use CONCAT_WS --- circ/pendingreserves.pl | 6 ++++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index f601659..cfb908f 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -123,7 +123,8 @@ if ( $run_report ) { biblio.author, count(DISTINCT items.itemnumber) as icount, count(DISTINCT reserves.borrowernumber) as rcount, - CONCAT_WS(' ', borrowers.firstname, borrowers.surname) as l_patron + borrowers.firstname, + borrowers.surname FROM reserves LEFT JOIN items ON items.biblionumber=reserves.biblionumber LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber @@ -164,7 +165,8 @@ if ( $run_report ) { { reservedate => $data->{l_reservedate}, priority => $data->{priority}, - name => $data->{l_patron}, + firstname => $data->{firstname} || '', + surname => $data->{surname}, title => $data->{title}, subtitle => $data->{subtitle}, author => $data->{author}, 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 7bda261..09f8d99 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -115,7 +115,7 @@ $(document).ready(function() {

[% reserveloo.pullcount %]

[% reserveloo.count %] [% reserveloo.rcount %] - [% reserveloo.name %] + [% reserveloo.firstname %] [%reserveloo.surname %]

[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] -- 2.1.4