Attachment 168442 Details for Bug 35959 – Bug 35959: Fix C3 merge of Koha::Old::Hold

[patch] Bug 35959: Fix C3 merge of Koha::Old::Hold

Bug-35959-Fix-C3-merge-of-KohaOldHold.patch (text/plain), 1.69 KB, created by Martin Renvoize (ashimema) on 2024-07-03 11:49:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-07-03 11:49:37 UTC

Size: 1.69 KB

patch

obsolete

>From b0e4e5b56d790d9a9e5d91804ab382484867a100 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 5 Apr 2024 14:03:05 +0200
>Subject: [PATCH] Bug 35959: Fix C3 merge of Koha::Old::Hold
>
>Test plan:
>
>Run `perl -c Koha/Old/Hold.pm`
>It should print 'syntax OK'
>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Reserves.pm | 2 +-
> Koha/Hold.pm   | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index 39c1b349d61..bc96dc9c3c1 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -44,7 +44,6 @@ use Koha::Holds;
> use Koha::ItemTypes;
> use Koha::Items;
> use Koha::Libraries;
>-use Koha::Old::Holds;
> use Koha::Patrons;
> use Koha::Plugins;
> use Koha::Policy::Holds;
>@@ -1597,6 +1596,7 @@ sub _FixPriority {
>         $hold = Koha::Holds->find( $reserve_id );
>         if (!defined $hold){
>             # may have already been checked out and hold fulfilled
>+            require Koha::Old::Holds;
>             $hold = Koha::Old::Holds->find( $reserve_id );
>         }
>         return unless $hold;
>diff --git a/Koha/Hold.pm b/Koha/Hold.pm
>index 12109ad5734..1faec873ec2 100644
>--- a/Koha/Hold.pm
>+++ b/Koha/Hold.pm
>@@ -34,7 +34,6 @@ use Koha::Biblios;
> use Koha::Hold::CancellationRequests;
> use Koha::Items;
> use Koha::Libraries;
>-use Koha::Old::Holds;
> use Koha::Calendar;
> use Koha::Plugins;
> 
>@@ -1014,6 +1013,7 @@ Move a hold to the old_reserve table following the same pattern as Koha::Patron-
> sub _move_to_old {
>     my ($self) = @_;
>     my $hold_infos = $self->unblessed;
>+    require Koha::Old::Hold;
>     return Koha::Old::Hold->new( $hold_infos )->store;
> }
> 
>-- 
>2.45.2

Actions: View | Diff | Splinter Review

Attachments on bug 35959: 161690 | 161692 | 161693 | 162410 | 162411 | 162481 | 162482 | 162483 | 164468 | 164469 | 164470 | 164471 | 166926 | 166927 | 166928 | 166929 | 168427 | 168441 | 168442 | 168443 | 168444 | 168445 | 168566