From 3632c7388eaf851eb1f80a238ae1d1aa2680e4d0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 6 Jun 2016 14:00:56 +0100 Subject: [PATCH] Bug 16671: (bug 14828 follow-up) Pick the right itemtypes Looking at commit aafe73eefb5151454fa8957bf188768324d23955 Bug 14828: Use Koha::ItemType[s] everywhere C4::ItemType was used -my @item_types = C4::ItemType->all; -my @for_loan = grep { $_->{notforloan} == 0 } @item_types - or BAIL_OUT("No adequate itemtype"); -my $itemtype = $for_loan[0]->{itemtype}; +my $itemtype = Koha::ItemTypes->search({ notforloan => 1 })->next; +$itemtype or BAIL_OUT("No adequate itemtype"); #FIXME Should be $itemtype = $itemtype->itemtype It seems that the tests expect itemtypes for loan. Test plan: prove t/db_dependent/HoldsQueue.t should still return green --- t/db_dependent/HoldsQueue.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t index 135c062..5b1f09e 100755 --- a/t/db_dependent/HoldsQueue.t +++ b/t/db_dependent/HoldsQueue.t @@ -61,8 +61,8 @@ my $borrower_branchcode = $borrower->{branchcode}; my @branchcodes = ( $library1->{branchcode}, $library2->{branchcode}, $library3->{branchcode} ); my @other_branches = ( $library2->{branchcode}, $library3->{branchcode} ); my $least_cost_branch_code = pop @other_branches; -my $itemtype = Koha::ItemTypes->search({ notforloan => 1 })->next; -$itemtype or BAIL_OUT("No adequate itemtype"); #FIXME Should be $itemtype = $itemtype->itemtype +my $itemtype = Koha::ItemTypes->search({ notforloan => 0 })->next->itemtype; +$itemtype or BAIL_OUT("No adequate itemtype"); #Set up the stage # Sysprefs and cost matrix -- 2.8.1