From bafafa22ba1e61131385850b2b278f6bfed1bc1e Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 1 May 2023 22:45:55 +0000 Subject: [PATCH] Bug 20844: (follow-up) Fixes for lists, objects, templates, tests --- C4/Circulation.pm | 3 +-- catalogue/moredetail.pl | 2 +- cataloguing/additem.pl | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index a22735bb922..1da64f87535 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -4125,7 +4125,6 @@ sub LostItem{ } # SendLostHoldNotices - my $item = Koha::Items->find( $itemnumber ); if ( C4::Context->preference('SendLostHoldNotices') && defined $hold && $item->itemlost ){ my $letter = C4::Letters::GetPreparedLetter( module => 'reserves', @@ -4136,7 +4135,7 @@ sub LostItem{ branches => $hold->branchcode, }, ); - C4::Message->enqueue($letter, $hold->borrower->unblessed, 'email'); + C4::Message->enqueue($letter, $hold->borrower, 'email'); } } diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index 898d26fefe7..78f0b830af3 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -248,7 +248,7 @@ foreach my $item (@items){ ); $item_info->{nomod} = !$patron->can_edit_items_from( $item->homebranch ); - $item_info->{waiting_holds} = $item->{object}->holds({ found => [ 'W', 'T' ], item_level_hold => { '!=' => 0 } })->count; + $item_info->{waiting_holds} = $item->holds({ found => [ 'W', 'T' ], item_level_hold => { '!=' => 0 } })->count; push @item_data, $item_info; } diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index fc64f5b276a..01cd30c00ed 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -760,7 +760,7 @@ my @ig = Koha::Biblio::ItemGroups->search({ biblio_id => $biblionumber })->as_li my @sorted_ig = sort { $a->display_order <=> $b->display_order } @ig; if ( C4::Context->preference('RevertLostBibLevelHolds') ){ - my @lostitems = Koha::Items->search({ biblionumber => $biblionumber, itemlost => { '!=' => 0 } }); + my @lostitems = Koha::Items->search({ biblionumber => $biblionumber, itemlost => { '!=' => 0 } })->as_list; # find if any of these lost items have waiting holds my @waitinglostitems; foreach my $lostitem ( @lostitems ){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 7f3c11b755a..d7874071f5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -123,8 +123,8 @@
This item has a waiting item-level hold on it, and has been marked as lost.
- - + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 8c6b6a64a6d..931787e64cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -92,10 +92,10 @@