Bugzilla – Attachment 144938 Details for
Bug 32528
Koha::Item->safe_to_delete should short-circuit earlier
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32528: Make safe_to_delete exit earlier on error conditions
Bug-32528-Make-safetodelete-exit-earlier-on-error-.patch (text/plain), 2.08 KB, created by
Jonathan Druart
on 2023-01-03 15:24:13 UTC
(
hide
)
Description:
Bug 32528: Make safe_to_delete exit earlier on error conditions
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2023-01-03 15:24:13 UTC
Size:
2.08 KB
patch
obsolete
>From cba5d82be61249935cafdfdb3039e3ee94782434 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >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 <tomascohen@theke.io> > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> > >Bug 32528: Change return logic > >Back to 1 return statement >Prevent the Koha::Result::Boolean instanciation duplication > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > Koha/Item.pm | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > >diff --git a/Koha/Item.pm b/Koha/Item.pm >index 11745194839..dae9df8f295 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.25.1
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 32528
:
144842
|
144847
|
144901
|
144925
| 144938