[open-ils-commits] r20409 - in branches/rel_2_0/Open-ILS/src/sql/Pg: . upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2011-05-04 01:18:18 -0400 (Wed, 04 May 2011)
New Revision: 20409

Added:
   branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql
Modified:
   branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
   branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
Collaboration patch from Joseph Lewis and Michael Peters addressing LP#758007, missing patron merge OU settings.

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2011-05-04 05:14:50 UTC (rev 20408)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2011-05-04 05:18:18 UTC (rev 20409)
@@ -57,7 +57,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0528'); -- dbs
+INSERT INTO config.upgrade_log (version) VALUES ('0529'); -- miker, for Joseph Lewis and Michael Peters
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2011-05-04 05:14:50 UTC (rev 20408)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2011-05-04 05:18:18 UTC (rev 20409)
@@ -7627,3 +7627,30 @@
     )
 ;
 
+
+-- add patron merge org unit settings
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_addresses', 
+  'Circ:  Patron Merge Address Delete', 
+  'Delete address(es) of subordinate user(s) in a patron merge', 
+   'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_cards', 
+  'Circ: Patron Merge Barcode Delete', 
+  'Delete barcode(s) of subordinate user(s) in a patron merge', 
+  'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.deactivate_cards', 
+  'Circ:  Patron Merge Deactivate Card', 
+  'Mark barcode(s) of subordinate user(s) in a patron merge as inactive', 
+  'bool'
+);
+

Copied: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql (from rev 20408, branches/rel_2_1/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql)
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql	                        (rev 0)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql	2011-05-04 05:18:18 UTC (rev 20409)
@@ -0,0 +1,29 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0529');
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_addresses', 
+  'Circ:  Patron Merge Address Delete', 
+  'Delete address(es) of subordinate user(s) in a patron merge', 
+   'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.delete_cards', 
+  'Circ: Patron Merge Barcode Delete', 
+  'Delete barcode(s) of subordinate user(s) in a patron merge', 
+  'bool'
+);
+
+INSERT INTO config.org_unit_setting_type 
+( name, label, description, datatype ) VALUES 
+( 'circ.user_merge.deactivate_cards', 
+  'Circ:  Patron Merge Deactivate Card', 
+  'Mark barcode(s) of subordinate user(s) in a patron merge as inactive', 
+  'bool'
+);
+
+COMMIT;