From f5dc85bee115aff11d6f74202800282f04c680ff Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 6 Jul 2020 20:38:42 +0000 Subject: [PATCH] Bug 25940: Check for reserve_id before Dopop TEST PLAN: 1. Have an item belonging to a different branch and check it in. 2. When the modal pops up hit 'Yes, print slip' or 'Print slip' if AutomaticItemReturn is set to 'don't' 3. The first print dialog should appear with a URL like '/cgi-bin/koha/circ/transfer-slip.pl?transferitem=18&&branchcode=CPL&op=slip' 4. Close that print dialog and you will immediately see another one that says 'No slip template found'. 5. Notice the URL of the second pop-up is: /cgi-bin/koha/circ/hold-transfer-slip.pl?reserve_id= 6. There is no reserve id so the template is not found. 7. Apply patch 8. Repeat 1-6 9. You should no longer have two print dialogs Signed-off-by: Lisette Scheer Signed-off-by: Kyle M Hall --- .../prog/en/modules/circ/returns.tt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 57ad49518a..2985ab88fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -923,16 +923,15 @@ e.preventDefault(); $(".modal").modal("show"); }); - - $(".print-slip").on('click', function(e) { - e.preventDefault(); - Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); - }); - - [% IF print_slip %] - Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); + [% IF reserve_id %] + $(".print-slip").on('click', function(e) { + e.preventDefault(); + Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); + }); + [% IF print_slip %] + Dopop('hold-transfer-slip.pl?reserve_id=[% reserve_id | uri %]'); + [% END %] [% END %] - var columns_settings = [% TablesSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) | $raw %] var returns_table = KohaTable("checkedintable", { "bFilter":false, -- 2.24.1 (Apple Git-126)