From 9198f025f189812bbab9c97c05fa47829942f7ad Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 23 Jul 2018 12:52:01 -0300 Subject: [PATCH] Bug 20469: Use DBIC rs and return ->count --- Koha/Item.pm | 11 ++++++++--- t/db_dependent/Koha/Items.t | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Koha/Item.pm b/Koha/Item.pm index 45f8995016..72e71594e7 100644 --- a/Koha/Item.pm +++ b/Koha/Item.pm @@ -289,9 +289,14 @@ sub current_holds { =cut sub is_waiting_or_transit { - my ( $self ) = @_; - return 1 if Koha::Holds->search({ itemnumber => $self->itemnumber, found => ['W', 'T'] })->count > 0; - return q{}; + my ($self) = @_; + + return $self->_result->reserves->search( + { + itemnumber => $self->itemnumber, + found => [ 'W', 'T' ], + } + )->count; } =head3 type diff --git a/t/db_dependent/Koha/Items.t b/t/db_dependent/Koha/Items.t index 51f1213654..0288a78876 100644 --- a/t/db_dependent/Koha/Items.t +++ b/t/db_dependent/Koha/Items.t @@ -174,7 +174,7 @@ subtest 'is_waiting_or_transit' => sub { is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, 1, 'Item has transit hold' ); $hold->found(undef)->store; - is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, q{}, + is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, 0, 'Item should be available' ); }; -- 2.11.0