From 3787e8e85f67852c783d68ff7cf5412aacef7a7d Mon Sep 17 00:00:00 2001 From: dbs Date: Thu, 4 Feb 2010 18:09:07 +0000 Subject: [PATCH] Give the correct i18n ID to MERGE_USERS (thanks to Benjamin Shum for catching this) Also add MERGE_USERS to the schema upgrade git-svn-id: svn://svn.open-ils.org/ILS/trunk@15449 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 | 2 +- Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index d857111b57..2a4647975c 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 ('0149'); -- Scott McKellar +INSERT INTO config.upgrade_log (version) VALUES ('0150'); -- dbs 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 f2e1038ba7..d011000ea9 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1252,7 +1252,7 @@ INSERT INTO permission.perm_list VALUES (359, 'HOLD_ITEM_CHECKED_OUT.override', oils_i18n_gettext(359, 'Allows a user to place a hold on an item that they already have checked out', 'ppl', 'description')), (360, 'RETRIEVE_RESERVATION_PULL_LIST', oils_i18n_gettext(360, 'Allows a user to retrieve a booking reservation pull list', 'ppl', 'description')), (361, 'CAPTURE_RESERVATION', oils_i18n_gettext(361, 'Allows a user to capture booking reservations', 'ppl', 'description')), - (362, 'MERGE_USERS', oils_i18n_gettext(361, 'Allows user records to be merged', 'ppl', 'description')) + (362, 'MERGE_USERS', oils_i18n_gettext(362, 'Allows user records to be merged', 'ppl', 'description')) ; SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000); diff --git a/Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql b/Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql new file mode 100644 index 0000000000..d49ce78a2e --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0150.data.permission.merge_users.sql @@ -0,0 +1,8 @@ +BEGIN; + +INSERT INTO config.upgrade_log (version) VALUES ('0150'); -- dbs + +INSERT INTO permission.perm_list (id, code, description) + VALUES (362, 'MERGE_USERS', 'Allows user records to be merged'); + +COMMIT; -- 2.11.0