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

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index d857111..2a46479 100644 (file)
--- 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 f2e1038..d011000 100644 (file)
--- 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 (file)
index 0000000..d49ce78
--- /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;