Attachment 158529 Details for Bug 34668 – Bug 34668: remove binding/unbinding event for one submit event

[patch] Bug 34668: remove binding/unbinding event for one submit event

Bug-34668-remove-bindingunbinding-event-for-one-su.patch (text/plain), 3.43 KB, created by ByWater Sandboxes on 2023-11-06 14:18:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2023-11-06 14:18:15 UTC

Size: 3.43 KB

patch

obsolete

>From 7ed1543e0aff9f0676441de3fd4cbc8bf375bdc5 Mon Sep 17 00:00:00 2001
>From: Shi Yao Wang <shi-yao.wang@inlibro.com>
>Date: Thu, 12 Oct 2023 15:51:55 -0400
>Subject: [PATCH] Bug 34668: remove binding/unbinding event for one submit
> event
>
>Signed-off-by: Mia Kujala <mia.kujala@xamk.fi>
>Signed-off-by: Kelly <kelly@bywatersolutions.com>
>---
> .../prog/en/modules/circ/circulation.tt       | 37 ++++++-------------
> 1 file changed, 11 insertions(+), 26 deletions(-)
>
>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 dc5e6c778e..c1c15767d4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -706,11 +706,7 @@
>                                             <a href="#" title="Checkout settings"><i class="fa-solid fa-sliders"></i></a>
>                                         </div>
> 
>-                                        [% IF waiting_holds_barcodes %]
>-                                            <button type="button" class="btn btn-primary">Check out</button>
>-                                        [% ELSE %]
>-                                            <button type="submit" class="btn btn-primary">Check out</button>
>-                                        [% END %]
>+                                        <button type="submit" class="btn btn-primary">Check out</button>
> 
>                                         <div class="circ-settings">
> 
>@@ -1007,31 +1003,20 @@
>                 [% FOREACH b IN waiting_holds_barcodes %]
>                     waiting_holds_barcodes.push("[% b | html %]");
>                 [% END %]
>-                $('#barcode').on('keyup', function() {
>-                    $('#mainform .btn-primary').off('click');
>-                    $('#barcode').off('keypress');
>+                $("#mainform").on('submit', function(){
>+                    if( $("#checkout_confirmed").length > 0 ){
>+                        return true;
>+                    }
>                     if ( waiting_holds_barcodes.includes($('#barcode').val().trim()) ) {
>-                        $('#mainform .btn-primary').on('click',function() {
>-                            $('#mainform').submit();
>-                        });
>-
>-                        $('#barcode').on('keypress', function(e) {
>-                            if (e.which == 13) {
>-                                $('#mainform').submit();
>-                            }
>-                        });
>+                        return true;
>                     } else {
>-                        $('#mainform .btn-primary').on('click',function() {
>-                            $('#circ-warnwaitingholds-modal').modal();
>-                        });
>-
>-                        $('#barcode').on('keypress', function(e) {
>-                            if (e.which == 13) {
>-                                $('#circ-warnwaitingholds-modal').modal();
>-                            }
>-                        });
>+                        $('#circ-warnwaitingholds-modal').modal();
>+                        return false;
>                     }
>                 });
>+                $("#circ-warnwaitingholds-modal").on('hidden.bs.modal',function(){
>+                    $("#mainform").append('<input type="hidden" id="checkout_confirmed" value=1>').submit();
>+                });
>             [% END %]
> 
>             $('#mainform').on('submit',function() {
>-- 
>2.30.2

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