[open-ils-commits] r15422 - trunk/Open-ILS/src/sql/Pg (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-02-01 16:25:33 -0500 (Mon, 01 Feb 2010)
New Revision: 15422

Modified:
   trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
forward porting r15420: add overlooked MERGE_USERS permission

Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-02-01 21:22:34 UTC (rev 15421)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-02-01 21:25:33 UTC (rev 15422)
@@ -1251,7 +1251,8 @@
     (358, 'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP', oils_i18n_gettext(358, 'Enables the user to create/update/delete booking reservation attribute value maps', 'ppl', 'description')),
     (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'))
+    (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'))
 ;
 
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);