[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8be9f005555932f74b2e047145446df5d643b923

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  8be9f005555932f74b2e047145446df5d643b923 (commit)
       via  1be684833a4d6cb26e63c3f4aeb79c19e08b74cf (commit)
      from  7225d8c488fa8e71d18d2f5ef4a3d0ed65d79f04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8be9f005555932f74b2e047145446df5d643b923
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Tue Jul 30 10:21:17 2019 -0400

    LP#1795972: stamp DB update
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 85d06ad918..efac488bd6 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1167', :eg_version); -- JBoyer/terran/sandbergja
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1168', :eg_version); -- csharp/khuckins/gmcharlt
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.apply_ws_setting_perm_description.sql b/Open-ILS/src/sql/Pg/upgrade/1168.data.apply_ws_setting_perm_description.sql
similarity index 75%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.apply_ws_setting_perm_description.sql
rename to Open-ILS/src/sql/Pg/upgrade/1168.data.apply_ws_setting_perm_description.sql
index 401c45fce5..de6a1d4999 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.apply_ws_setting_perm_description.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1168.data.apply_ws_setting_perm_description.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1168', :eg_version); -- csharp/khuckins/gmcharlt
 
 UPDATE permission.perm_list 
     SET description = oils_i18n_gettext(

commit 1be684833a4d6cb26e63c3f4aeb79c19e08b74cf
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Mon May 20 15:07:08 2019 -0400

    LP#1795972: Add description for APPLY_WORKSTATION_SETTING permission.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.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 81620b8b7d..67b04715fd 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1911,7 +1911,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 607, 'EMERGENCY_CLOSING', oils_i18n_gettext( 607,
     'Create and manage Emergency Closings', 'ppl', 'description' )),
  (608, 'APPLY_WORKSTATION_SETTING',
-   oils_i18n_gettext(608, 'APPLY_WORKSTATION_SETTING', 'ppl', 'description')),
+   oils_i18n_gettext(608, 'Allows a user to apply values to workstation settings', 'ppl', 'description')),
  ( 609, 'MANAGE_CUSTOM_PERM_GRP_TREE', oils_i18n_gettext( 609,
     'Allows a user to manage custom permission group lists.', 'ppl', 'description' )),
  ( 610, 'CLEAR_PURCHASE_REQUEST', oils_i18n_gettext(610,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.apply_ws_setting_perm_description.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.apply_ws_setting_perm_description.sql
new file mode 100644
index 0000000000..401c45fce5
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.apply_ws_setting_perm_description.sql
@@ -0,0 +1,12 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE permission.perm_list 
+    SET description = oils_i18n_gettext(
+        '608',
+        'Allows a user to apply values to workstation settings',
+        'ppl', 'description')
+    WHERE code = 'APPLY_WORKSTATION_SETTING' and description = 'APPLY_WORKSTATION_SETTING';
+
+COMMIT;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql                    |  2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql                 |  2 +-
 .../upgrade/1168.data.apply_ws_setting_perm_description.sql  | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1168.data.apply_ws_setting_perm_description.sql


hooks/post-receive
-- 
Evergreen ILS