Attachment 113233 Details for Bug 24412 – Bug 24412: (follow-up) prevent error in svc/holds

[patch] Bug 24412: (follow-up) prevent error in svc/holds

Bug-24412-follow-up-prevent-error-in-svcholds.patch (text/plain), 1.43 KB, created by Jonathan Druart on 2020-11-06 10:59:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-11-06 10:59:32 UTC

Size: 1.43 KB

patch

obsolete

>From f30ed1eb0795f5914a7efb33b0f8a0c3d8d711da Mon Sep 17 00:00:00 2001
>From: Nicolas Legrand <nicolas.legrand@bulac.fr>
>Date: Thu, 22 Oct 2020 18:17:47 +0200
>Subject: [PATCH] Bug 24412: (follow-up) prevent error in svc/holds
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>don't fail if a hold has no desk attached.
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> svc/holds | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/svc/holds b/svc/holds
>index 5a60f3c0e4..5e0a9d91fb 100755
>--- a/svc/holds
>+++ b/svc/holds
>@@ -72,6 +72,12 @@ while ( my $h = $holds_rs->next() ) {
> 
>     my $biblionumber = $h->biblio()->biblionumber();
> 
>+    my $desk_id = $h->desk_id;
>+    my $desk_name = '';
>+    if ($desk_id) {
>+        $desk_name = $h->desk()->desk_name();
>+    }
>+
>     my $itemtype_limit;
>     if ( $h->itemtype ) {
>         my $itemtype = Koha::ItemTypes->find( $h->itemtype );
>@@ -97,7 +103,7 @@ while ( my $h = $holds_rs->next() ) {
>         reserve_id     => $h->reserve_id(),
>         branchcode     => $h->branch()->branchname(),
>         branches       => $libraries,
>-        desk_name      => $h->desk()->desk_name(),
>+        desk_name      => $desk_name,
>         reservedate    => $h->reservedate(),
>         expirationdate => $h->expirationdate(),
>         suspend        => $h->suspend(),
>-- 
>2.20.1

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