Attachment 112208 Details for Bug 24412 – Bug 24412: (follow-up) bad desk printing

[patch] Bug 24412: (follow-up) bad desk printing

Bug-24412-follow-up-bad-desk-printing.patch (text/plain), 2.56 KB, created by Séverine Queune on 2020-10-22 16:30:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Séverine Queune

Created: 2020-10-22 16:30:47 UTC

Size: 2.56 KB

patch

obsolete

>From 0ce65c95f88c23fd532bc202866bc63fd888f0ef 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
>
>forgot to update two pages when I wrote Hold->desk to replace
>Desks.GetName.
>---
> 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 a7ef638..bf47e82 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 dd5736d..cf72809 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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 24412: 97328 | 97329 | 97330 | 101625 | 101626 | 101627 | 101628 | 101629 | 101630 | 101721 | 101722 | 101723 | 101825 | 101884 | 101885 | 101886 | 101898 | 101899 | 101900 | 101955 | 101956 | 101957 | 106586 | 106648 | 110067 | 110068 | 110069 | 110070 | 110450 | 110451 | 110452 | 110453 | 110454 | 110455 | 110582 | 110583 | 110584 | 110585 | 110586 | 112046 | 112047 | 112048 | 112049 | 112050 | 112092 | 112099 | 112165 | 112166 | 112167 | 112168 | 112169 | 112170 | 112171 | 112172 | 112201 | 112202 | 112203 | 112204 | 112205 | 112206 | 112207 | 112208 | 112209 | 112210 | 112211 | 112212 | 112213 | 112214 | 112215 | 112216 | 112217 | 112218 | 112219 | 112264 | 112265 | 112266 | 112267 | 112268 | 112269 | 112270 | 112271 | 112272 | 112292 | 112293 | 113108 | 113109 | 113116 | 113228 | 113229 | 113230 | 113231 | 113232 | 113233 | 113234 | 113235 | 113236