From 26b085cf18f7e0fc9401aee05d43048dc9515db6 Mon Sep 17 00:00:00 2001 From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4> Date: Wed, 4 May 2011 05:14:50 +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/branches/rel_2_1@20408 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 ++++++++++++++++++++ .../upgrade/0529.data.merge_user-ou_settings.sql | 29 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 5c634d59a2..79f4ff4a96 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log ( 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, 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 1af2c967ac..1a2259c505 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' +); + diff --git a/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql b/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql new file mode 100644 index 0000000000..6bc688fa94 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0529.data.merge_user-ou_settings.sql @@ -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; -- 2.11.0