From 55c131ac148bdc4a9d337825237239f6f71beea7 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Wed, 23 Sep 2020 16:39:40 -0400 Subject: [PATCH] LP#1835127 - Fix conflict with perm IDs vs. commit to master Signed-off-by: Chris Sharp --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 4 ++-- .../src/sql/Pg/upgrade/1238.data.permission.booking_reservation.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 112b1ed412..27aa0c3030 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1938,9 +1938,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')) ; -- 2.11.0