From 24aa85393fe6473a2a44317f6af3eb3344ae0229 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 15 Jan 2014 16:24:00 +0100 Subject: [PATCH] Bug 11562: sysprefs.sql is not correctly sorted. The QA tools does not manage to catch error sorting on the sysprefs.sql file if it is already bad sorted. This patch tidies up the sysprefs file. TEST PLAN --------- 0) Back up your system preferences table. 1) check out master 2) Use your koha database, and then: DELETE FROM systempreferences; SOURCE ~/kohaclone/installer/data/mysql/sysprefs.sql 3) suspend your mysql client and type something similar to: mysql -u root -p -e 'USE kohadata;SELECT * from systempreferences ORDER BY Variable;' > ~/master_sysprefs 4) apply the patch 5) foreground your mysql client, and then: DELETE FROM systempreferences; SOURCE ~/kohaclone/installer/data/mysql/sysprefs.sql 6) suspend your mysql client and type something similar to: mysql -u root -p -e 'USE kohadata;SELECT * from systempreferences ORDER BY Variable;' > ~/11562_sysprefs 7) foreground your mysql client and quit 8) Take a diff, they should be identical diff ~/master_sysprefs ~/11562_sysprefs NOTE: You can't use your own system preferences values, because upgrades and changed values would require a lot of time to compare the results. Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall --- installer/data/mysql/sysprefs.sql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 9df6f9b..89bf368 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'), -- 1.7.2.5