From e3e5740caa9e9d468d21c25d4fa18499b4f7484b Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 22 Apr 2020 13:30:06 +0000 Subject: [PATCH] Bug 25248: Item is returned if deletion successful, not 1 To test: 1 - Have a record with some items 2 - Click 'Delete all' under 'Edit' 3 - Confirm deletion 4 - Note you are redirected to additem.pl 5 - Add an item 6 - Apply patch 7 - Delete all items again 8 - Note you are redirected to detail.pl --- cataloguing/additem.pl | 2 +- tools/viewlog.pl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 1a7e9385eb..8025241b6f 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -687,7 +687,7 @@ if ($op eq "additem") { my $items = Koha::Items->search({ biblionumber => $biblionumber }); while ( my $item = $items->next ) { $error = $item->safe_delete({ skip_modzebra_update => 1 }); - next if $error eq '1'; # Means ok + next if ref $error eq 'Koha::Item'; # Deleted item is returned if deletion successful push @errors,$error; } C4::Biblio::ModZebra( $biblionumber, "specialUpdate", "biblioserver" ); diff --git a/tools/viewlog.pl b/tools/viewlog.pl index 2ccd472f0e..7336985211 100755 --- a/tools/viewlog.pl +++ b/tools/viewlog.pl @@ -50,6 +50,7 @@ my $input = new CGI; $debug or $debug = $cgi_debug; my $do_it = $input->param('do_it'); my @modules = $input->multi_param("modules"); +warn Data::Dumper::Dumper( @modules ); my $user = $input->param("user") // ''; my @actions = $input->multi_param("actions"); my @interfaces = $input->multi_param("interfaces"); @@ -147,7 +148,7 @@ if ($do_it) { $search_params{info} = $info if $info; $search_params{object} = $object if $object; } - +warn Data::Dumper::Dumper( \%search_params ); my @logs = Koha::ActionLogs->search(\%search_params); my @data; -- 2.11.0