From 2b92f43cc315968da3d17088c183df619f0a33cc Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 26 Dec 2022 15:43:16 -0300 Subject: [PATCH] Bug 32528: Make safe_to_delete exit earlier on error conditions This patch makes the `Koha::Item->safe_to_delete` method return right after one of the checked conditions is met. This way we avoid further DB queries and processing. No behavior change is expected To test: 1. Run: $ kshell k$ prove t/db_dependent/Koha/Item.t => SUCCESS: Tests pass! 2. Apply this patch 3. Repeat 1 => SUCCESS: Tests STILL pass! 4. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens Bug 32528: Change return logic Back to 1 return statement Prevent the Koha::Result::Boolean instanciation duplication Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit cc58ca2a3cc71d2af6b2342979ec310e89fec3a6) Signed-off-by: Jacob O'Mara --- Koha/Item.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Koha/Item.pm b/Koha/Item.pm index 1174519483..dae9df8f29 100644 --- a/Koha/Item.pm +++ b/Koha/Item.pm @@ -293,20 +293,20 @@ sub safe_to_delete { $error = "book_on_loan" if $self->checkout; - $error = "not_same_branch" + $error //= "not_same_branch" if defined C4::Context->userenv - and !C4::Context->IsSuperLibrarian() - and C4::Context->preference("IndependentBranches") - and ( C4::Context->userenv->{branch} ne $self->homebranch ); + && !C4::Context->IsSuperLibrarian() + && C4::Context->preference("IndependentBranches") + && ( C4::Context->userenv->{branch} ne $self->homebranch ); # check it doesn't have a waiting reserve - $error = "book_reserved" + $error //= "book_reserved" if $self->holds->filter_by_found->count; - $error = "linked_analytics" + $error //= "linked_analytics" if C4::Items::GetAnalyticsCount( $self->itemnumber ) > 0; - $error = "last_item_for_hold" + $error //= "last_item_for_hold" if $self->biblio->items->count == 1 && $self->biblio->holds->search( { -- 2.39.5