From 988dc3b64af00d34f535b811f4093782ac7925a1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 15 Jan 2014 16:24:00 +0100 Subject: [PATCH] Bug 11562: re-sort sysprefs.sql The QA tools does not manage to catch error sorting on the sysprefs.sql file if it is already badly sorted. This patch tidies up the sysprefs file. TEST PLAN --------- [1] Verify that loading sysprefs.sql into an empty Koha database (or one whose system preferences table is is empty) works. Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton RM note: I must point out that there ZERO functionality associated with the order that system preferences occur in that SQL script; they are sorted solely in an attempt to reduce the likelihood of merge conflicts during the development process. Consequently, I dislike language that suggests it is an "error" if sysprefs.sql happens to not be perfectly sorted; it is at most an inconvenience. --- installer/data/mysql/sysprefs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 9df6f9bf4d..89bf3680a4 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -80,8 +80,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'), ('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'), ('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'), -('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'), ('COinSinOPACResults','1','','If ON, use COinS in OPAC search results page. NOTE: this can slow down search response time significantly','YesNo'), +('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'), ('CurrencyFormat','US','US|FR','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\' in \'FR\' or \'360,000.00\' in \'US\'.','Choice'), ('dateformat','us','metric|us|iso','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd)','Choice'), ('DebugLevel','2','0|1|2','Define the level of debugging information sent to the browser when errors are encountered (set to 0 in production). 0=none, 1=some, 2=most','Choice'), -- 2.39.2