LP#1750894 Bump perm ID; apply consistently

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.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 b3f0a2c..2aba1ba 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1905,9 +1905,12 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 606, 'DELETE_COPY_ALERT', oils_i18n_gettext( 606,
     'Delete copy alerts', 'ppl', 'description' )),
  ( 607, 'EMERGENCY_CLOSING', oils_i18n_gettext( 607,
-    'Create and manage Emergency Closings', 'ppl', 'description' ))
+    'Create and manage Emergency Closings', 'ppl', 'description' )),
+ (607, 'APPLY_WORKSTATION_SETTING',
+   oils_i18n_gettext(607, 'APPLY_WORKSTATION_SETTING', 'ppl', 'description'))
 ;
 
+
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);
 
 INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm) VALUES
@@ -18330,10 +18333,6 @@ AND control_set = 1
 AND ahf.heading_purpose = 'related'
 AND ahf.heading_type = 'genre_form_term';
 
-INSERT INTO permission.perm_list (id, code, description) VALUES
- (607, 'APPLY_WORKSTATION_SETTING',
-   oils_i18n_gettext(607, 'APPLY_WORKSTATION_SETTING', 'ppl', 'description'));
-
 INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
 VALUES (
     'eg.circ.checkin.no_precat_alert', 'circ', 'bool',

diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql
index d50c371..12046cd 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql
@@ -1,8 +1,8 @@
 BEGIN;
 
 INSERT INTO permission.perm_list (id, code, description) VALUES
- (607, 'APPLY_WORKSTATION_SETTING',
-   oils_i18n_gettext(607, 'APPLY_WORKSTATION_SETTING', 'ppl', 'description'));
+ (608, 'APPLY_WORKSTATION_SETTING',
+   oils_i18n_gettext(608, 'APPLY_WORKSTATION_SETTING', 'ppl', 'description'));
 
 INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
 VALUES (