Fix for Bug 7077 - Add system pref to control behavior of submitting empty barcode field
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. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
parent
26e9c67755
commit
bc92dda8c4
5 changed files with 21 additions and 7 deletions
|
@ -703,6 +703,7 @@ $template->param(
|
||||||
circview => 1,
|
circview => 1,
|
||||||
soundon => C4::Context->preference("SoundOn"),
|
soundon => C4::Context->preference("SoundOn"),
|
||||||
fast_cataloging => $fast_cataloging,
|
fast_cataloging => $fast_cataloging,
|
||||||
|
CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"),
|
||||||
);
|
);
|
||||||
|
|
||||||
# save stickyduedate to session
|
# save stickyduedate to session
|
||||||
|
|
|
@ -329,4 +329,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 ('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('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('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');
|
|
@ -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 MODIFY debarred DATE DEFAULT NULL;");
|
||||||
$dbh->do("ALTER TABLE deletedborrowers ADD COLUMN debarredcomment VARCHAR(255) DEFAULT NULL AFTER debarred;");
|
$dbh->do("ALTER TABLE deletedborrowers ADD COLUMN debarredcomment VARCHAR(255) DEFAULT NULL AFTER debarred;");
|
||||||
print "Upgrade done (Change borrowers.debarred into Date )\n";
|
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);
|
SetVersion($DBversion);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -91,6 +91,13 @@ Circulation:
|
||||||
yes: Record
|
yes: Record
|
||||||
no: "Don't record"
|
no: "Don't record"
|
||||||
- local use when an unissued item is checked in.
|
- 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:
|
Checkout Policy:
|
||||||
-
|
-
|
||||||
- pref: AllowNotForLoanOverride
|
- pref: AllowNotForLoanOverride
|
||||||
|
|
|
@ -46,12 +46,12 @@
|
||||||
$( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
|
$( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
|
||||||
}
|
}
|
||||||
} ).attr( 'checked', false );
|
} ).attr( 'checked', false );
|
||||||
[% END %]
|
[% END %][% IF ( CircAutoPrintQuickSlip ) %]
|
||||||
// listen submit to trigger qslip on empty checkout
|
// listen submit to trigger qslip on empty checkout
|
||||||
$('#mainform').bind('submit',function() {
|
$('#mainform').bind('submit',function() {
|
||||||
if ($('#barcode').val() == '') {
|
if ($('#barcode').val() == '') {
|
||||||
return printx_window('qslip'); }
|
return printx_window('qslip'); }
|
||||||
});
|
});[% END %]
|
||||||
|
|
||||||
|
|
||||||
var allcheckboxes = $(".checkboxed");
|
var allcheckboxes = $(".checkboxed");
|
||||||
|
|
Loading…
Reference in a new issue