From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 23 Feb 2010 18:35:20 +0000 (+0000)
Subject: fix an org setting label mixup
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bb22e00bdedd59ad5dd002a40c4dca55bdf803ef;p=contrib%2FConifer.git

fix an org setting label mixup

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15626 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 1676b9848a..1610013947 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
     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,
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index ef94becbcd..395fbf172f 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1541,12 +1541,12 @@ INSERT into config.org_unit_setting_type
   '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' ),
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/0170.data.org-setting-credit-locale-description-fix.sql b/Open-ILS/src/sql/Pg/upgrade/0170.data.org-setting-credit-locale-description-fix.sql
new file mode 100644
index 0000000000..a522cace13
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0170.data.org-setting-credit-locale-description-fix.sql
@@ -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;