gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 30648: Tidy 

Signed-off-by: Anneli Österman <anneli.osterman@koha-suomi.fi>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit e5b86bb23a)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Nick Clemens 2024-10-11 13:11:10 +00:00 committed by Lucas Gass
parent 1577d3833f
commit ccb75f9815
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
C4/Biblio.pm
View File

@ -555,12 +555,13 @@ sub DelBiblio {
# We delete any existing holds
my $holds = $biblio->holds;
$holds->update({ deleted_biblionumber => $biblionumber }, { no_triggers => 1 });
$holds->update( { deleted_biblionumber => $biblionumber }, { no_triggers => 1 } );
my $old_holds = $biblio->old_holds;
$old_holds->update({ deleted_biblionumber => $biblionumber }, { no_triggers => 1 });
$old_holds->update( { deleted_biblionumber => $biblionumber }, { no_triggers => 1 } );
while ( my $hold = $holds->next ) {
# no need to update the holds queue on each step, we'll do it at the end
$hold->cancel({ skip_holds_queue => 1 });
$hold->cancel( { skip_holds_queue => 1 } );
}
# We update any existing orders

6
installer/data/mysql/atomicupdate/bug_30648.pl
View File

@ -2,11 +2,11 @@ use Modern::Perl;
use Koha::Installer::Output qw(say_warning say_failure say_success say_info);
return {
bug_number => "30648",
bug_number => "30648",
description => "Store biblionumber of deleted record in old reserves",
up => sub {
up => sub {
my ($args) = @_;
my ($dbh, $out) = @$args{qw(dbh out)};
my ( $dbh, $out ) = @$args{qw(dbh out)};
if ( !column_exists( 'reserves', 'deleted_biblionumber' ) ) {
$dbh->do(

2
t/db_dependent/Biblio.t
View File

@ -712,7 +712,7 @@ subtest 'DelBiblio' => sub {
}
);
C4::Biblio::DelBiblio($biblio->biblionumber);
C4::Biblio::DelBiblio( $biblio->biblionumber );
$old_hold->discard_changes();
$hold = Koha::Old::Holds->find( $hold->reserve_id );
ok( $hold, "Hold has been successfully cancelled on deletion of biblio" );

8
t/lib/TestBuilder.pm
View File

@ -628,13 +628,13 @@ sub _gen_default_values {
opacusercss => q{},
},
Reserve => {
non_priority => 0,
item_group_id => undef,
non_priority => 0,
item_group_id => undef,
deleted_biblionumber => undef,
},
OldReserve => {
non_priority => 0,
item_group_id => undef,
non_priority => 0,
item_group_id => undef,
deleted_biblionumber => undef,
},
Itemtype => {