From fc8d877f8851ec49911ee519ad52d945b4bcf00e Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 7 Jan 2021 15:57:16 +0000 Subject: [PATCH] Bug 27282: fix all occurrences This patch fixes all the occurrences, staff and OPAC. The problem only happens on some versions of Chrome. TO TEST: -set up a new list with a few items -go to /cgi-bin/koha/virtualshelves/shelves.pl and view that list. -Click 'Print List' in Chrome. -The tab opens but immediately closes itself. -Apply patch and clear cache -Try again, the print dialouge remains open -Go to cgi-bin/koha/sco/sco-main.pl in Chrome, make sure you can finish and print successfully -In the staff client in Chrome makes sure printing works in the following areas: 1. /cgi-bin/koha/circ/circulation.pl Print Slip and Print Quick Slip 2. /cgi-bin/koha/members/boraccount.pl Make a payment and make sure you can print the invoice 3. cgi-bin/koha/labels/spinelabel-home.pl Make a quick spine label in Chrome and make sure that prints. Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 55b050b607869169aae2c52d1f89fd79f62af400) Signed-off-by: Fridolin Somers (cherry picked from commit b4ccde1133d1040d6f6094aa1d3ddcd2b91e9174) Signed-off-by: Andrew Fuerste-Henry --- koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc | 5 ++++- koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc index d5e60ac8d9..fba67cffcf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc @@ -6,7 +6,10 @@ [% ELSE %] $( window ).load(function() { window.print(); - setTimeout('window.close()', 1); + window.onafterprint = function () { + window.close(); + } + setTimeout('window.close()', 1000); //Hack from Chrome < 63 }); [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc index 63f4bc2897..51c1e0177d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc @@ -5,7 +5,10 @@ [% ELSE %] $( window ).load(function() { window.print(); - setTimeout('window.close()', 1); + window.onafterprint = function () { + window.close(); + } + setTimeout('window.close()', 1000); //Hack from Chrome < 63 }); [% END %] -- 2.39.5