Attachment 158359 Details for Bug 34668 – Bug 34668: pass whole waiting_holds rs

[patch] Bug 34668: pass whole waiting_holds rs

Bug-34668-pass-whole-waitingholds-rs.patch (text/plain), 2.75 KB, created by Shi Yao Wang on 2023-11-03 17:16:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shi Yao Wang

Created: 2023-11-03 17:16:50 UTC

Size: 2.75 KB

patch

obsolete

>From ed92ab8dff54bf987112537aacd33f0caace00b2 Mon Sep 17 00:00:00 2001
>From: Shi Yao Wang <shi-yao.wang@inlibro.com>
>Date: Fri, 3 Nov 2023 13:13:56 -0400
>Subject: [PATCH] Bug 34668: pass whole waiting_holds rs
>
>---
> circ/circulation.pl                                   | 11 ++---------
> .../intranet-tmpl/prog/en/modules/circ/circulation.tt |  8 ++++----
> 2 files changed, 6 insertions(+), 13 deletions(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index bdab0b9afa..ace0100156 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -597,15 +597,8 @@ if ( $patron ) {
>     $template->param( patron_messages => $patron_messages );
> 
>     if ( C4::Context->preference("WaitingNotifyAtCheckout") ) {
>-
>-        #Check for waiting holds
>-        my $waiting_holds          = $patron->holds->search( { found => 'W', branchcode => $branch } );
>-        my @waiting_holds_barcodes = ();
>-        while ( my $hold = $waiting_holds->next ) {
>-            push( @waiting_holds_barcodes, $hold->item->barcode );
>-        }
>-
>-        $template->param( waiting_holds_barcodes => \@waiting_holds_barcodes );
>+        my $waiting_holds = $patron->holds->search( { found => 'W', branchcode => $branch } );
>+        $template->param( waiting_holds => $waiting_holds );
>     }
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index c1c15767d4..353215754f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -905,7 +905,7 @@
>     </div> 
> </div> 
> 
>-[% IF waiting_holds_barcodes %]
>+[% IF waiting_holds %]
>     <div id="circ-warnwaitingholds-modal" class="modal fade audio-alert-action block">
>         <div class="modal-dialog">
>             <div class="modal-content">
>@@ -994,14 +994,14 @@
>             var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
>         }
>         $(document).ready(function() {
>-            [% IF waiting_holds_barcodes %]
>+            [% IF waiting_holds %]
>                 $('#circ-warnwaitingholds-modal .btn-primary').on('click',function() {
>                     $('#mainform').submit();
>                 });
> 
>                 var waiting_holds_barcodes = new Array();
>-                [% FOREACH b IN waiting_holds_barcodes %]
>-                    waiting_holds_barcodes.push("[% b | html %]");
>+                [% FOREACH wh IN waiting_holds %]
>+                    waiting_holds_barcodes.push("[% wh.item.barcode | html %]");
>                 [% END %]
>                 $("#mainform").on('submit', function(){
>                     if( $("#checkout_confirmed").length > 0 ){
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 34668: 155044 | 155045 | 155143 | 155188 | 156992 | 157243 | 157312 | 157315 | 157316 | 158359 | 158528 | 158529 | 158530 | 160673 | 160674 | 160675 | 160676