[open-ils-commits] r20210 - in branches/rel_2_1/Open-ILS/src/sql/Pg: . upgrade (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2011-04-19 11:53:44 -0400 (Tue, 19 Apr 2011)
New Revision: 20210

Added:
   branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/0522.client_menus.sql
Removed:
   branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/XXXX.client_menus.sql
Modified:
   branches/rel_2_1/Open-ILS/src/sql/Pg/002.schema.config.sql
   branches/rel_2_1/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
lock in upgrade script version #, tweak org setting labels and descriptions

Signed-off-by: Jason Etheridge <jason at esilibrary.com>


Modified: branches/rel_2_1/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- branches/rel_2_1/Open-ILS/src/sql/Pg/002.schema.config.sql	2011-04-19 15:53:41 UTC (rev 20209)
+++ branches/rel_2_1/Open-ILS/src/sql/Pg/002.schema.config.sql	2011-04-19 15:53:44 UTC (rev 20210)
@@ -57,7 +57,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0521'); -- dbs
+INSERT INTO config.upgrade_log (version) VALUES ('0522'); -- tsbere/phasefx
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: branches/rel_2_1/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- branches/rel_2_1/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2011-04-19 15:53:41 UTC (rev 20209)
+++ branches/rel_2_1/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2011-04-19 15:53:44 UTC (rev 20210)
@@ -1883,13 +1883,13 @@
     'bool'),
 
 ( 'ui.general.button_bar',
-    oils_i18n_gettext('ui.general.button_bar', 'Button bar', 'coust', 'label'),
-    oils_i18n_gettext('ui.general.button_bar', 'Button bar', 'coust', 'description'),
+    oils_i18n_gettext('ui.general.button_bar', 'GUI: Button bar', 'coust', 'label'),
+    oils_i18n_gettext('ui.general.button_bar', 'Set to "circ" or "cat" for stock circulator or cataloger toolbar, respectively.', 'coust', 'description'),
     'string'),
 
 ( 'ui.general.hotkeyset',
-    oils_i18n_gettext('ui.general.hotkeyset', 'Default Hotkeyset', 'coust', 'label'),
-    oils_i18n_gettext('ui.general.hotkeyset', 'Default Hotkeyset for clients (filename without the .keyset)', 'coust', 'description'),
+    oils_i18n_gettext('ui.general.hotkeyset', 'GUI: Default Hotkeyset', 'coust', 'label'),
+    oils_i18n_gettext('ui.general.hotkeyset', 'Default Hotkeyset for clients (filename without the .keyset).  Examples: Default, Minimal, and None', 'coust', 'description'),
     'string'),
 
 ( 'circ.hold_shelf_status_delay',

Copied: branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/0522.client_menus.sql (from rev 20209, branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/XXXX.client_menus.sql)
===================================================================
--- branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/0522.client_menus.sql	                        (rev 0)
+++ branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/0522.client_menus.sql	2011-04-19 15:53:44 UTC (rev 20210)
@@ -0,0 +1,14 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0522'); -- tsbere/phasefx
+
+UPDATE config.org_unit_setting_type SET datatype = 'string' WHERE name = 'ui.general.button_bar';
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype) VALUES ('ui.general.hotkeyset', 'GUI: Default Hotkeyset', 'Default Hotkeyset for clients (filename without the .keyset).  Examples: Default, Minimal, and None', 'string');
+
+UPDATE actor.org_unit_setting SET value='"circ"' WHERE name = 'ui.general.button_bar' AND value='true';
+
+UPDATE actor.org_unit_setting SET value='"none"' WHERE name = 'ui.general.button_bar' AND value='false';
+
+COMMIT;
+

Deleted: branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/XXXX.client_menus.sql
===================================================================
--- branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/XXXX.client_menus.sql	2011-04-19 15:53:41 UTC (rev 20209)
+++ branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/XXXX.client_menus.sql	2011-04-19 15:53:44 UTC (rev 20210)
@@ -1,14 +0,0 @@
-BEGIN;
-
-INSERT INTO config.upgrade_log (version) VALUES ('XXXX');
-
-UPDATE config.org_unit_setting_type SET datatype = 'string' WHERE name = 'ui.general.button_bar';
-
-INSERT INTO config.org_unit_setting_type ( name, label, description, datatype) VALUES ('ui.general.hotkeyset', 'Default Hotkeyset', 'Default Hotkeyset for clients (filename without the .keyset)', 'string');
-
-UPDATE actor.org_unit_setting SET value='"circ"' WHERE name = 'ui.general.button_bar' AND value='true';
-
-UPDATE actor.org_unit_setting SET value='"none"' WHERE name = 'ui.general.button_bar' AND value='false';
-
-COMMIT;
-