Bugzilla – Attachment 6473 Details for
Bug 7270
Removing double itemtype on shelve contents page when no icon is shown
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Revised patch
patch.txt (text/plain), 5.64 KB, created by
Marcel de Rooy
on 2011-11-30 15:49:28 UTC
(
hide
)
Description:
Revised patch
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2011-11-30 15:49:28 UTC
Size:
5.64 KB
patch
obsolete
>From bf81bcb1a0bedd159f2e13a4639aa428d472187d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 21 Oct 2011 15:04:53 -0400 >Subject: [PATCH] Fix for Bug 7077 - Add system pref to control behavior of submitting empty barcode field >Content-Type: text/plain; charset="utf-8" > >Adds a new system preference, CircAutoPrintQuickSlip: > >When an empty an empty barcode field is submitted in circulation >[ clear the screen | open a print quick slip window ]. > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> > >Fixed a merge conflict with the updatedatabase.pl > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Another merge conflict resolved. Marked as Passed QA. >--- > circ/circulation.pl | 1 + > installer/data/mysql/sysprefs.sql | 2 +- > installer/data/mysql/updatedatabase.pl | 6 ++++++ > .../en/modules/admin/preferences/circulation.pref | 7 +++++++ > .../prog/en/modules/circ/circulation.tt | 12 ++++++------ > 5 files changed, 21 insertions(+), 7 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index fa043dd..4d70eb5 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -703,6 +703,7 @@ $template->param( > circview => 1, > soundon => C4::Context->preference("SoundOn"), > fast_cataloging => $fast_cataloging, >+ CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"), > ); > > # save stickyduedate to session >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index ae2c1cb..453c561 100755 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -328,4 +328,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('EasyAnalyticalRecords','0','If on, display in the catalogue screens tools to easily setup analytical record relationships','','YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowRecentComments',0,'If ON a link to recent comments will appear in the OPAC masthead',NULL,'YesNo'); >- >+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CircAutoPrintQuickSlip', '1', 'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or Clear the screen.',NULL,'YesNo'); >\ No newline at end of file >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index efa9898..77d61eb 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -4560,7 +4560,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > $dbh->do("ALTER TABLE deletedborrowers MODIFY debarred DATE DEFAULT NULL;"); > $dbh->do("ALTER TABLE deletedborrowers ADD COLUMN debarredcomment VARCHAR(255) DEFAULT NULL AFTER debarred;"); > print "Upgrade done (Change borrowers.debarred into Date )\n"; >+ SetVersion($DBversion); >+} > >+$DBversion = "3.07.00.XXX"; >+if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >+ $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CircAutoPrintQuickSlip', '1', 'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or Clear the screen.',NULL,'YesNo');"); >+ print "Upgrade to $DBversion done (Add syspref CircAutoPrintQuickSlip to control what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window or clear the screen. )\n"; > SetVersion($DBversion); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index f4946b5..817ce57 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -91,6 +91,13 @@ Circulation: > yes: Record > no: "Don't record" > - local use when an unissued item is checked in. >+ - >+ - When an empty an empty barcode field is submitted in circulation >+ - pref: CircAutoPrintQuickSlip >+ choices: >+ yes: "open a print quick slip window" >+ no: "clear the screen" >+ - . > Checkout Policy: > - > - pref: AllowNotForLoanOverride >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 5627109..6a502af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -46,12 +46,12 @@ > $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show(); > } > } ).attr( 'checked', false ); >- [% END %] >- // listen submit to trigger qslip on empty checkout >- $('#mainform').bind('submit',function() { >- if ($('#barcode').val() == '') { >- return printx_window('qslip'); } >- }); >+ [% END %][% IF ( CircAutoPrintQuickSlip ) %] >+ // listen submit to trigger qslip on empty checkout >+ $('#mainform').bind('submit',function() { >+ if ($('#barcode').val() == '') { >+ return printx_window('qslip'); } >+ });[% END %] > > > var allcheckboxes = $(".checkboxed"); >-- >1.6.0.6 >
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 7270
:
6445
|
6446
|
6473
|
6474
|
6485