From 857a25fd7644b11f810d0aeb9d33889d5a7e21ae Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 8 Jun 2018 10:34:29 +0200 Subject: [PATCH] Bug 20271: (QA follow-up) Remove last occurrences of deleted_at Trivial replace of deleted_at by deleted_on. Test plan: Run t/db_dependent/Koha/ItemTypes.t Run t/db_dependent/Items_DelItemCheck.t git grep -E "deleted_at\W" Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec --- Koha/ItemType.pm | 2 +- t/db_dependent/Items_DelItemCheck.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Koha/ItemType.pm b/Koha/ItemType.pm index 4c815fe..01283c7 100644 --- a/Koha/ItemType.pm +++ b/Koha/ItemType.pm @@ -101,7 +101,7 @@ Counts up the number of biblioitems and items with itemtype (code) and hands bac sub can_be_deleted { my ($self) = @_; - my $nb_items = Koha::Items->search( { itype => $self->itemtype, deleted_at => undef } )->count; + my $nb_items = Koha::Items->search( { itype => $self->itemtype, deleted_on => undef } )->count; my $nb_biblioitems = Koha::Biblioitems->search( { itemtype => $self->itemtype } )->count; return $nb_items + $nb_biblioitems == 0 ? 1 : 0; } diff --git a/t/db_dependent/Items_DelItemCheck.t b/t/db_dependent/Items_DelItemCheck.t index 0963ebd..66ad433 100644 --- a/t/db_dependent/Items_DelItemCheck.t +++ b/t/db_dependent/Items_DelItemCheck.t @@ -161,7 +161,7 @@ DelItemCheck( $biblio->{biblionumber}, $item->{itemnumber} ); my $test_item = GetItem( $item->{itemnumber} ); -isnt( $test_item->{deleted_at}, undef, +isnt( $test_item->{deleted_on}, undef, "DelItemCheck should delete item if ItemSafeToDelete returns true" ); -- 2.1.4