Bugzilla – Attachment 159065 Details for
Bug 20844
Reset a hold when it is missing after allocation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20844: (follow-up) Fixes for lists, objects, templates, tests
Bug-20844-follow-up-Fixes-for-lists-objects-templa.patch (text/plain), 5.43 KB, created by
Aleisha Amohia
on 2023-11-16 21:18:38 UTC
(
hide
)
Description:
Bug 20844: (follow-up) Fixes for lists, objects, templates, tests
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2023-11-16 21:18:38 UTC
Size:
5.43 KB
patch
obsolete
>From bafafa22ba1e61131385850b2b278f6bfed1bc1e Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >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 @@ > <div class="dialog alert"> > This item has a waiting item-level hold on it, and has been marked as lost.<br> > <form action="updateitem.pl" method="post" class="inline"> >- <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]"> >- <input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]"> >+ <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]"> >+ <input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]"> > <button type="submit" name="reverthold" value="1" class="btn btn-default"><i class="fa fa-undo"></i> Revert waiting status</button> > <button type="submit" name="cancelhold" value="1" class="btn btn-default"><i class="fa fa-times"></i> Cancel hold</button> > </form> >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 @@ > <ul> > [% FOREACH i IN waitinglostitems %] > <br> >- <li>Item (<i>[% i.barcode %]</i>) >+ <li>Item (<i>[% i.barcode | html %]</i>) > <form action="../catalogue/updateitem.pl" method="post" class="inline"> >- <input type="hidden" name="itemnumber" value="[% i.itemnumber %]"> >- <input type="hidden" name="biblionumber" value="[% i.biblionumber %]"> >+ <input type="hidden" name="itemnumber" value="[% i.itemnumber | html %]"> >+ <input type="hidden" name="biblionumber" value="[% i.biblionumber | html %]"> > <input type="hidden" name="redirecturl" value="../cataloguing/additem.pl?biblionumber="> > <button type="submit" name="reverthold" value="1" class="btn btn-default"><i class="fa fa-undo"></i> Revert waiting status</button> > <button type="submit" name="cancelhold" value="1" class="btn btn-default"><i class="fa fa-times"></i> Cancel hold</button></li> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20844
:
79267
|
80760
|
80761
|
80890
|
80891
|
81045
|
81531
|
81623
|
81624
|
81640
|
81697
|
81698
|
81710
|
81711
|
81712
|
102334
|
102335
|
102336
|
113208
|
113209
|
113210
|
118264
|
118265
|
118266
|
125437
|
125438
|
125439
|
140214
|
140215
|
140216
|
150348
|
150349
|
150350
|
150480
|
159062
|
159063
|
159064
|
159065
|
159111
|
170263
|
170264