From 910f404e497c7c8598a87d61e75f3598c50e0a30 Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 4 May 2011 05:12:10 +0000 Subject: [PATCH] Collaboration patch from Joseph Lewis and Michael Peters addressing LP#758007, missing patron merge OU settings. git-svn-id: svn://svn.open-ils.org/ILS/trunk@20406 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 27 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index c0bc8c1..ff48b1e 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -86,7 +86,7 @@ CREATE TRIGGER no_overlapping_deps BEFORE INSERT OR UPDATE ON config.db_patch_dependencies FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0528', :eg_version); -- dbs +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0529', :eg_version); -- miker, for Joseph Lewis and Michael Peters 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 1af2c96..1a2259c 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -7994,3 +7994,30 @@ INSERT into config.org_unit_setting_type oils_i18n_gettext( 'ui.unified_volume_copy_editor', 'If true combines the Volume/Copy Creator and Item Attribute Editor in some instances.', 'coust', 'description'), 'bool' ); + +-- 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' +); + -- 1.7.2.5