From: Chris Sharp <csharp@georgialibraries.org>
Date: Wed, 23 Sep 2020 20:39:40 +0000 (-0400)
Subject: LP#1835127 - Fix conflict with perm IDs vs. commit to master
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b61fa26f858c4d9d96c5f93b6954c11d2eddc318;p=working%2FEvergreen.git

LP#1835127 - Fix conflict with perm IDs vs. commit to master

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---

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 0addc3c02b..40a697b2e2 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1940,9 +1940,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
     'View booking resource types', 'ppl', 'description')),
  ( 622, 'VIEW_BOOKING_RESOURCE', oils_i18n_gettext(622,
     'View booking resources', 'ppl', 'description')),
- ( 623, 'VIEW_BOOKING_RESERVATION', oils_i18n_gettext(623,
+ ( 625, 'VIEW_BOOKING_RESERVATION', oils_i18n_gettext(623,
     'View booking reservations', 'ppl', 'description')),
- ( 624, 'VIEW_BOOKING_RESERVATION_ATTR_MAP', oils_i18n_gettext(624,
+ ( 626, 'VIEW_BOOKING_RESERVATION_ATTR_MAP', oils_i18n_gettext(624,
     'View booking reservation attribute maps', 'ppl', 'description'))
 ;
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/1238.data.permission.booking_reservation.sql b/Open-ILS/src/sql/Pg/upgrade/1238.data.permission.booking_reservation.sql
index 3259ad4687..314d95ffae 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1238.data.permission.booking_reservation.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1238.data.permission.booking_reservation.sql
@@ -3,9 +3,9 @@ BEGIN;
 SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
 
 INSERT INTO permission.perm_list ( id, code, description ) VALUES
- ( 623, 'VIEW_BOOKING_RESERVATION', oils_i18n_gettext(623,
+ ( 625, 'VIEW_BOOKING_RESERVATION', oils_i18n_gettext(623,
     'View booking reservations', 'ppl', 'description')),
- ( 624, 'VIEW_BOOKING_RESERVATION_ATTR_MAP', oils_i18n_gettext(624,
+ ( 626, 'VIEW_BOOKING_RESERVATION_ATTR_MAP', oils_i18n_gettext(624,
     'View booking reservation attribute maps', 'ppl', 'description'))
 ;