From 5d1b7e313c46ca69f000086f77e334bcd16f7711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Thu, 7 Apr 2016 19:10:55 +0200 Subject: [PATCH] [PASSED QA] Bug 16218: printfeercpt.tt (and others) does not include jQuery This patch adds [% INCLUDE 'doc-head-close.inc' %] to the following files (to make them include jQuery): koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt To test: 1) Temporarily include the follwing lines in syspref IntranetSlipPrinterJS: function printThenClose() { if (typeof jQuery != 'undefined') { // jQuery is loaded => print the version alert(jQuery.fn.jquery); } else { alert('jQuery not available'); } } 2) Go to a users page and print slips: From the Print button in the tool bar: - Print summary - Print slip - Print quick slip From the "Fines" tab: Account - 'Print' link in the table with paid transactions Without patch, a JavaScript message 'jQuery not avaliable' appears. With patch, the message displays the current jQuery version (1.7.2) 3) Remove IntranetSlipPrinterJS - Verify that the slips above print as expected. Signed-off-by: Hector Castro Works as expected Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt index 9bf6707..991cb68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt @@ -9,7 +9,7 @@ [% ELSIF ( title ) %] Koha › Patrons › [% title %] [% END %] - +[% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index d7637ec..ac797ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -3,6 +3,7 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Summary for [% firstname %] [% surname %] ([% cardnumber %]) + [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt index c7d67a1..f544ebd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -1,6 +1,7 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] Print Receipt for [% cardnumber %] +[% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt index d99c1a9..51d11bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -2,6 +2,7 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Print Receipt for [% cardnumber %] +[% INCLUDE 'doc-head-close.inc' %] -- 1.9.1