[open-ils-commits] r15626 - in trunk/Open-ILS/src/sql/Pg: . upgrade (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-02-23 13:35:20 -0500 (Tue, 23 Feb 2010)
New Revision: 15626

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0170.data.org-setting-credit-locale-description-fix.sql
Modified:
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
fix an org setting label mixup

Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-02-23 18:17:49 UTC (rev 15625)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-02-23 18:35:20 UTC (rev 15626)
@@ -51,7 +51,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0169'); -- phasefx
+INSERT INTO config.upgrade_log (version) VALUES ('0170'); -- phasefx
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-02-23 18:17:49 UTC (rev 15625)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-02-23 18:35:20 UTC (rev 15626)
@@ -1541,12 +1541,12 @@
   'interval' ),
 
 ( 'credit.payments.allow',
-  '',
+  'Allow Credit Card Payments',
   'If enabled, patrons will be able to pay fines accrued at this location via credit card',
   'bool' ),
 
 ( 'global.default_locale',
-  'Allow Credit Card Payments',
+  'Global Default Locale',
   null,
   'string' ),
 

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0170.data.org-setting-credit-locale-description-fix.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0170.data.org-setting-credit-locale-description-fix.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0170.data.org-setting-credit-locale-description-fix.sql	2010-02-23 18:35:20 UTC (rev 15626)
@@ -0,0 +1,13 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0170'); -- phasefx
+
+UPDATE config.org_unit_setting_type
+    SET label = 'Global Default Locale' -- FIXME: Ironically, no I18N here nor in the seed data
+    WHERE name = 'global.default_locale' AND label = 'Allow Credit Card Payments';
+
+UPDATE config.org_unit_setting_type
+    SET label = 'Allow Credit Card Payments'
+    WHERE name = 'credit.payments.allow' AND label = '';
+
+COMMIT;