From fa052b7bdd24c7b9234d7c3a036e8d9a9d78d1f1 Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Sat, 14 Aug 2021 06:54:45 +0000
Subject: [PATCH] Bug 26346: (follow-up) Fixes in response to QA

* Fix addressing comment #59 - Making can_be_deleted() consistent to
testing Patrons::find

* Fix addressing comment comment #61 - Have made the first and second
lines consistent, both now return 0

Sponsord-By: Catalyst IT
---
 Koha/Virtualshelf.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Koha/Virtualshelf.pm b/Koha/Virtualshelf.pm
index 1400bbdcc8..6707f1bf44 100644
--- a/Koha/Virtualshelf.pm
+++ b/Koha/Virtualshelf.pm
@@ -186,7 +186,8 @@ sub add_biblio {
     return if $already_exists;
 
     # Check permissions
-    return unless ( $self->owner == $borrowernumber && $self->allow_change_from_owner ) || ( $self->allow_change_from_staff && Koha::Patrons->find( $borrowernumber )->can_patron_change_staff_only_lists ) || $self->allow_change_from_others;
+    my $patron = Koha::Patrons->find( $borrowernumber ) or return 0;
+    return 0 unless ( $self->owner == $borrowernumber && $self->allow_change_from_owner ) || ( $self->allow_change_from_staff && $patron->can_patron_change_staff_only_lists ) || $self->allow_change_from_others;
 
     my $content = Koha::Virtualshelfcontent->new(
         {
@@ -236,7 +237,7 @@ sub can_be_deleted {
     return 0 unless $borrowernumber;
     return 1 if $self->owner == $borrowernumber;
 
-    my $patron = Koha::Patrons->find( $borrowernumber );
+    my $patron = Koha::Patrons->find( $borrowernumber ) or return 0;
 
     return 1 if $self->is_public and haspermission( $patron->userid, { lists => 'delete_public_lists' } );
 
@@ -257,6 +258,8 @@ sub can_be_managed {
 sub can_biblios_be_added {
     my ( $self, $borrowernumber ) = @_;
 
+    my $patron = Koha::Patrons->find( $borrowernumber ) or return 0;
+
     return 1
       if $borrowernumber
       and ( ( $self->owner == $borrowernumber && $self->allow_change_from_owner ) or ( $self->allow_change_from_staff && Koha::Patrons->find( $borrowernumber )->can_patron_change_staff_only_lists ) or $self->allow_change_from_others );
-- 
2.11.0