From 6bcefedd7adcb4f7e7c48006797191aa9c837fa3 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 17 Jun 2019 12:44:37 -0300 Subject: [PATCH] Bug 23133: Rename uses of item_level_hold Signed-off-by: Martin Renvoize --- C4/Reserves.pm | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 2 +- t/db_dependent/Reserves.t | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 097a5c09d6..8c38c50843 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -210,7 +210,7 @@ sub AddReserve { waitingdate => $waitingdate, expirationdate => $expdate, itemtype => $itemtype, - item_level_hold => $checkitem ? 1 : 0, + item_level => $checkitem ? 1 : 0, } )->store(); $hold->set_waiting() if $found eq 'W'; @@ -1924,7 +1924,7 @@ sub RevertWaitingStatus { $sth = $dbh->prepare( $query ); $sth->execute( $reserve->{'reserve_id'} ); - unless ( $hold->item_level_hold ) { + unless ( $hold->item_level ) { $hold->itemnumber(undef)->store; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index a878658d21..34a402b44d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -142,7 +142,7 @@ [% END %] [% ELSE %] - [% IF ( hold.item_level_hold ) %] + [% IF ( hold.item_level ) %] Only item diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t index 624335196a..33fe84a879 100755 --- a/t/db_dependent/Reserves.t +++ b/t/db_dependent/Reserves.t @@ -739,7 +739,7 @@ subtest 'ChargeReserveFee tests' => sub { is( $line->branchcode, $library->id , "Library id is picked from userenv and stored correctly" ); }; -subtest 'reserves.item_level_hold' => sub { +subtest 'reserves.item_level' => sub { plan tests => 2; my $item = $builder->build_sample_item; @@ -758,7 +758,7 @@ subtest 'reserves.item_level_hold' => sub { $item->itemnumber ); my $hold = Koha::Holds->find($reserve_id); - is( $hold->item_level_hold, 1, 'item_level_hold should be set when AddReserve is called with a specific item' ); + is( $hold->item_level, 1, 'item_level_hold should be set when AddReserve is called with a specific item' ); # Mark it waiting ModReserveAffect( $item->itemnumber, $patron->borrowernumber, 1 ); @@ -780,7 +780,7 @@ subtest 'reserves.item_level_hold' => sub { $item->biblionumber, undef, 1 ); my $hold = Koha::Holds->find($reserve_id); - is( $hold->item_level_hold, 0, 'item_level_hold should not be set when AddReserve is called without a specific item' ); + is( $hold->item_level, 0, 'item_level_hold should not be set when AddReserve is called without a specific item' ); # Mark it waiting ModReserveAffect( $item->itemnumber, $patron->borrowernumber, 1 ); -- 2.20.1