From 6ec6681e05d2546db84a84ff7ad0a399e4308c8b Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Tue, 14 Sep 2021 21:33:47 -1000 Subject: [PATCH] Bug 29026: Restore behavior when an empty barcode field is submitted in circulation When preference CircAutoPrintQuickSlip is 'clear the screen', when an empty barcode field is submitted in circulation : Before Bug 17845, behavior was to display empty circulation page (no patron selected). Now behavior is displaying the circulation page of current patron. I think previous behavior was used when scanner is used to clear form and wait for another patron card to be scanned. Test plan : 1) Set system preference CircAutoPrintQuickSlip to 'clear the screen' 2) Go to a patron circulation page 3) Post form without a barcode => Check you go to circulation page with no patron selected 4) Set system preference CircAutoPrintQuickSlip to 'open a print quick slip window' 5) Go to a patron circulation page 6) Post form without a barcode => Check you go to print quick slip window with correct datas Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 841cb7839498cf69d59d3b7861ced42f8aba9d45) Signed-off-by: Fridolin Somers --- .../prog/en/modules/circ/circulation.tt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 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 570be944bc..3faee650a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1171,14 +1171,17 @@ }); } - [% IF !( CircAutoPrintQuickSlip == 'clear' ) %] - // listen submit to trigger qslip on empty checkout - $('#mainform').bind('submit',function() { - if ($('#barcode').val() == '') { + // listen submit to trigger qslip on empty checkout + $('#mainform').bind('submit',function() { + if ($('#barcode').val() == '') { + [% IF ( CircAutoPrintQuickSlip == 'clear' ) %] + window.location='/cgi-bin/koha/circ/circulation.pl'; + return false; + [% ELSE %] return printx_window( '[% CircAutoPrintQuickSlip | html %]' ); - } - }); - [% END %] + [% END %] + } + }); toggle_onsite_checkout(); $("#onsite_checkout").click(function(){ toggle_onsite_checkout(); -- 2.39.5