Attachment 156992 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.15 KB, created by Shi Yao Wang on 2023-10-12 19:53:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shi Yao Wang

Created: 2023-10-12 19:53:56 UTC

Size: 3.15 KB

patch

obsolete

>From ee09b9f289ad3cd36a6734f9317ec878ac8cf709 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
>
>---
> .../prog/en/modules/circ/circulation.tt       | 37 +++++--------------
> 1 file changed, 10 insertions(+), 27 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 45932a0de6..c9522f1b66 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -666,11 +666,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">
> 
>@@ -966,29 +962,16 @@
>                 [% 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');
>-                    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();
>-                            }
>-                        });
>-                    } else {
>-                        $('#mainform .btn-primary').on('click',function() {
>+                $('#mainform').on('submit', function() {
>+                    if (waiting_holds_barcodes) {
>+                        if ( waiting_holds_barcodes.includes($('#barcode').val().trim()) ) {
>+                            return true;
>+                        } else {
>                             $('#circ-warnwaitingholds-modal').modal();
>-                        });
>-
>-                        $('#barcode').on('keypress', function(e) {
>-                            if (e.which == 13) {
>-                                $('#circ-warnwaitingholds-modal').modal();
>-                            }
>-                        });
>+                            return false;
>+                        }
>+                    } else {
>+                        return true;
>                     }
>                 });
>             [% END %]
>-- 
>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