From 197f63cc21a4fa64f755f96c68521453f3fff0c2 Mon Sep 17 00:00:00 2001 From: Nicolas Legrand <nicolas.legrand@bulac.fr> Date: Thu, 22 Oct 2020 13:31:15 +0200 Subject: [PATCH] Bug 24412: (follow-up) bad desk printing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit forgot to update two pages when I wrote Hold->desk to replace Desks.GetName. Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> --- koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index a7ef638daa..bf47e822aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -37,7 +37,7 @@ [% END %] </td> <td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td> - <td>[% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% IF (reserveloo.desk_id ) %], [% Desks.GetName (reserveloo.desk_id) | html %][% END %]</td> + <td>[% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% IF (reserveloo.desk_id ) %], [% reserveloo.desk.desk_name | html %][% END %]</td> <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => reserveloo.item.location) | html %]</td> <td>[% reserveloo.item.itemcallnumber | html %]</td> <td>[% reserveloo.item.copynumber | html %]</td> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index dd5736de7d..cf72809082 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -100,7 +100,7 @@ <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i> [% IF ( HOLD.is_at_destination ) %] Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong> - [% IF ( HOLD.desk_id ) %], [% Desks.GetName ( HOLD.desk_id ) | html %],[% END %] + [% IF ( HOLD.desk_id ) %], [% HOLD.desk.desk_name | html %],[% END %] [% IF ( HOLD.waitingdate ) %] since [% HOLD.waitingdate | $KohaDates %] [% IF HOLD.expirationdate %] -- 2.20.1