Bugzilla – Attachment 10570 Details for
Bug 7563
Silent print slips using Firefox PlugIn jsPrintSetup and new staff client preference
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[REBASED] Bug 7563 - Silent print slips using Firefox PlugIn jsPrintSetup and new staff client preference
REBASED-Bug-7563---Silent-print-slips-using-Firefo.patch (text/plain), 4.81 KB, created by
Marc Véron
on 2012-06-29 19:34:36 UTC
(
hide
)
Description:
[REBASED] Bug 7563 - Silent print slips using Firefox PlugIn jsPrintSetup and new staff client preference
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2012-06-29 19:34:36 UTC
Size:
4.81 KB
patch
obsolete
>From b8761ae57ad1a03dd718b0277338b9714b392700 Mon Sep 17 00:00:00 2001 >From: Marc Veron <veron@veron.ch> >Date: Fri, 29 Jun 2012 21:31:34 +0200 >Subject: [PATCH] [REBASED] Bug 7563 - Silent print slips using Firefox PlugIn jsPrintSetup and new staff client preference >Content-Type: text/plain; charset="utf-8" > >...to version 3.09.00.021 >--- > installer/data/mysql/sysprefs.sql | 2 +- > installer/data/mysql/updatedatabase.pl | 7 +++++++ > .../en/modules/admin/preferences/staff_client.pref | 5 +++++ > .../prog/en/modules/circ/printslip.tt | 12 ++++++++---- > members/printslip.pl | 2 ++ > 5 files changed, 23 insertions(+), 5 deletions(-) > >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 6a3735d..7009155 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -374,4 +374,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' > INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACShowUnusedAuthorities','1','','Show authorities that are not being used in the OPAC.','YesNo'); > INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo'); >- >+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 4da22e7..2699dce 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -5452,6 +5452,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion ="XXX"; >+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { >+ $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free')"); >+ print "Upgrade to $DBversion done (Add system preference IntranetSlipPrinterJS))\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref >index b93f8fd..b6be289 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref >@@ -16,6 +16,11 @@ Staff Client: > class: url > - on all pages in the staff interface, instead of the default. (This should be a complete URL, starting with <code>http://</code>.) > - >+ - "Use the following JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/:" >+ - pref: IntranetSlipPrinterJS >+ type: textarea >+ class: code >+ - > - "Include the following CSS on all pages in the staff client:" > - pref: IntranetUserCSS > type: textarea >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 3e60d73..7b29d4e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -8,10 +8,14 @@ > [% END %] > > <script language="javascript"> >- function printThenClose() { >- window.print(); >- window.close(); >- } >+[% IF ( IntranetSlipPrinterJS ) %] >+ [% IntranetSlipPrinterJS %] >+[% ELSE %] >+ function printThenClose() { >+ window.print(); >+ window.close(); >+ } >+[% END %] > </script> > </head> > <body id="circ_printslip" class="circ" onload="printThenClose();"> >diff --git a/members/printslip.pl b/members/printslip.pl >index 3a499cd..71fdda2 100755 >--- a/members/printslip.pl >+++ b/members/printslip.pl >@@ -89,4 +89,6 @@ $template->param( > error => $error, > ); > >+$template->param( IntranetSlipPrinterJS => C4::Context->preference('IntranetSlipPrinterJS' ) ); >+ > output_html_with_http_headers $input, $cookie, $template->output; >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7563
:
9290
|
9306
|
9307
|
9981
|
10063
|
10068
|
10071
|
10073
|
10104
|
10427
|
10428
|
10557
| 10570 |
11149