Bugzilla – Attachment 65428 Details for
Bug 19025
Move C4::Reserves::GetReserveInfo to Koha::Holds
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19025: Move GetReserveInfo to Koha::Holds
Bug-19025-Move-GetReserveInfo-to-KohaHolds.patch (text/plain), 3.31 KB, created by
Jonathan Druart
on 2017-08-02 14:53:05 UTC
(
hide
)
Description:
Bug 19025: Move GetReserveInfo to Koha::Holds
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-08-02 14:53:05 UTC
Size:
3.31 KB
patch
obsolete
>From b827ff1648d20408d0343267e753282cc964b1b9 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 2 Aug 2017 11:49:08 -0300 >Subject: [PATCH] Bug 19025: Move GetReserveInfo to Koha::Holds > >This subroutine is only used once and can be replaced with a call to >Koha::Holds->find >It will avoid unnecessary joins. > >Test plan: >- Define a HOLD_SLIP template notice using fields from the tables >reserves, branches, borrowers, biblio, biblioitems and items. >- Generate one and make sure the values are correctly filled >--- > C4/Reserves.pm | 3 ++- > t/db_dependent/Holds.t | 9 ++------- > t/db_dependent/Reserves/GetReserveFee.t | 1 - > 3 files changed, 4 insertions(+), 9 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 50982306a1..04bd7d9d36 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -2178,7 +2178,8 @@ sub ReserveSlip { > biblionumber => $biblionumber, > borrowernumber => $borrowernumber > }) or return; >- my $reserve = GetReserveInfo($reserve_id) or return; >+ my $reserve = Koha::Holds->find($reserve_id) or return; >+ $reserve = $reserve->unblessed; > > return C4::Letters::GetPreparedLetter ( > module => 'circulation', >diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t >index ad87b26129..584acb281d 100755 >--- a/t/db_dependent/Holds.t >+++ b/t/db_dependent/Holds.t >@@ -7,7 +7,7 @@ use t::lib::TestBuilder; > > use C4::Context; > >-use Test::More tests => 58; >+use Test::More tests => 57; > use MARC::Record; > use C4::Biblio; > use C4::Items; >@@ -211,11 +211,6 @@ ModReserveMinusPriority( $itemnumber, $reserve->{'reserve_id'} ); > $holds = $patron->holds; > is( $holds->next->itemnumber, $itemnumber, "Test ModReserveMinusPriority()" ); > >- >-my $reserve2 = GetReserveInfo( $reserve->{'reserve_id'} ); >-ok( $reserve->{'reserve_id'} eq $reserve2->{'reserve_id'}, "Test GetReserveInfo()" ); >- >- > $holds = $biblio->holds; > $hold = $holds->next; > AlterPriority( 'top', $hold->reserve_id ); >@@ -323,7 +318,7 @@ my $reserveid2 = C4::Reserves::GetReserveId( > > CancelReserve({ reserve_id => $reserveid1 }); > >-$reserve2 = GetReserve( $reserveid2 ); >+my $reserve2 = GetReserve( $reserveid2 ); > is( $reserve2->{priority}, 1, "After cancelreserve, the 2nd reserve becomes the first on the waiting list" ); > > ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch_1, holdingbranch => $branch_1 } , $bibnum); >diff --git a/t/db_dependent/Reserves/GetReserveFee.t b/t/db_dependent/Reserves/GetReserveFee.t >index 31e45bb6a6..3ce2bd6e2e 100755 >--- a/t/db_dependent/Reserves/GetReserveFee.t >+++ b/t/db_dependent/Reserves/GetReserveFee.t >@@ -193,7 +193,6 @@ subtest 'Integration with AddIssue' => sub { > > $dbh->do( "DELETE FROM issues WHERE borrowernumber = ?", undef, $patron1->{borrowernumber} ); > my $id = addreserve( $patron1->{borrowernumber} ); >- my $r = C4::Reserves::GetReserveInfo($id); > is( acctlines( $patron1->{borrowernumber} ), 0, 'any_time_is_collected - Patron should not be charged yet (just checking to make sure)'); > C4::Circulation::AddIssue( $patron1, $item1->{barcode}, '2015-12-31', 0, undef, 0, {} ); > is( acctlines( $patron1->{borrowernumber} ), 1, 'any_time_is_collected - Patron should not be charged when checking out an item which was not placed hold for him' ); >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19025
:
65428
|
65429
|
65449
|
65450