[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. bf398f0fac0bf694d8b22ac47c85c0e00bffc6b1

Evergreen Git git at git.evergreen-ils.org
Thu Jul 23 10:02:32 EDT 2020


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, rel_3_4 has been updated
       via  bf398f0fac0bf694d8b22ac47c85c0e00bffc6b1 (commit)
       via  84818d35249d3e8e3d5d0f3346aabc59d3f0313d (commit)
      from  4e97cedc212bff316606730c7248c1a3febc0572 (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 bf398f0fac0bf694d8b22ac47c85c0e00bffc6b1
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date:   Thu Jul 23 06:37:07 2020 -0700

    LP#1705302: Stamping Upgrade Script
    
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 8187c3b8ee..4b7ac15f56 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 ('1206', :eg_version); -- miker/dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1207', :eg_version); -- mrisher/tmcanna/sandbergja
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1705302-update-receipt-template-setting-descriptions.sql b/Open-ILS/src/sql/Pg/upgrade/1207.data.lp1705302-update-receipt-template-setting-descriptions.sql
similarity index 96%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1705302-update-receipt-template-setting-descriptions.sql
rename to Open-ILS/src/sql/Pg/upgrade/1207.data.lp1705302-update-receipt-template-setting-descriptions.sql
index ae4c590b2b..f318618cea 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1705302-update-receipt-template-setting-descriptions.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1207.data.lp1705302-update-receipt-template-setting-descriptions.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1207', :eg_version);
 
 UPDATE config.org_unit_setting_type 
         SET description = oils_i18n_gettext(

commit 84818d35249d3e8e3d5d0f3346aabc59d3f0313d
Author: Mike Risher <mrisher at catalyte.io>
Date:   Tue Jun 11 09:57:58 2019 -0700

    lp1705302 update description of receipt template
    
    Updated editing instructions to give correct syntax and changing name
    from receipt templates to Print Templates
    
    Signed-off-by: Mike Risher <mrisher at catalyte.io>
    
     Changes to be committed:
            modified:   src/sql/Pg/950.data.seed-values.sql
            new file:   src/sql/Pg/upgrade/XXXX.data.lp1705302-update-receipt-template-setting-descriptions.sql
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

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 a9c1add110..5bc0db68ae 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -3958,7 +3958,7 @@ INSERT into config.org_unit_setting_type
         'Content of alert_text include',
         'coust', 'label'),
     oils_i18n_gettext('circ.staff_client.receipt.alert_text',
-        'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(alert_text)%',
+        'Text to be inserted into Print Templates in place of {{includes.alert_text}}',
         'coust', 'description'),
     'string', null)
 
@@ -3967,7 +3967,7 @@ INSERT into config.org_unit_setting_type
         'Content of event_text include',
         'coust', 'label'),
     oils_i18n_gettext('circ.staff_client.receipt.event_text',
-        'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(event_text)%',
+        'Text to be inserted into Print Templates in place of {{includes.event_text}}',
         'coust', 'description'),
     'string', null)
 
@@ -3976,7 +3976,7 @@ INSERT into config.org_unit_setting_type
         'Content of footer_text include',
         'coust', 'label'),
     oils_i18n_gettext('circ.staff_client.receipt.footer_text',
-        'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(footer_text)%',
+        'Text to be inserted into Print Templates in place of {{includes.footer_text}}',
         'coust', 'description'),
     'string', null)
 
@@ -3985,7 +3985,7 @@ INSERT into config.org_unit_setting_type
         'Content of header_text include',
         'coust', 'label'),
     oils_i18n_gettext('circ.staff_client.receipt.header_text',
-        'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(header_text)%',
+        'Text to be inserted into Print Templates in place of {{includes.header_text}}',
         'coust', 'description'),
     'string', null)
 
@@ -3994,7 +3994,7 @@ INSERT into config.org_unit_setting_type
         'Content of notice_text include',
         'coust', 'label'),
     oils_i18n_gettext('circ.staff_client.receipt.notice_text',
-        'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(notice_text)%',
+        'Text to be inserted into Print Templates in place of {{includes.notice_text}}',
         'coust', 'description'),
     'string', null)
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1705302-update-receipt-template-setting-descriptions.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1705302-update-receipt-template-setting-descriptions.sql
new file mode 100644
index 0000000000..ae4c590b2b
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.lp1705302-update-receipt-template-setting-descriptions.sql
@@ -0,0 +1,36 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE config.org_unit_setting_type 
+        SET description = oils_i18n_gettext(
+            'circ.staff_client.receipt.alert_text',
+            'Text to be inserted into Print Templates in place of {{includes.alert_text}}',
+            'cwst', 'label') 
+        WHERE name = 'circ.staff_client.receipt.alert_text';
+UPDATE config.org_unit_setting_type 
+        SET description = oils_i18n_gettext(
+            'circ.staff_client.receipt.event_text',
+            'Text to be inserted into Print Templates in place of {{includes.event_text}}',
+            'cwst', 'label') 
+        WHERE name = 'circ.staff_client.receipt.event_text';
+UPDATE config.org_unit_setting_type 
+        SET description = oils_i18n_gettext(
+            'circ.staff_client.receipt.footer_text',
+            'Text to be inserted into Print Templates in place of {{includes.footer_text}}',
+            'cwst', 'label') 
+        WHERE name = 'circ.staff_client.receipt.footer_text';
+UPDATE config.org_unit_setting_type 
+        SET description = oils_i18n_gettext(
+            'circ.staff_client.receipt.header_text',
+            'Text to be inserted into Print Templates in place of {{includes.header_text}}',
+            'cwst', 'label') 
+        WHERE name = 'circ.staff_client.receipt.header_text';
+UPDATE config.org_unit_setting_type 
+        SET description = oils_i18n_gettext(
+            'circ.staff_client.receipt.notice_text',
+            'Text to be inserted into Print Templates in place of {{includes.notice_text}}',
+            'cwst', 'label') 
+        WHERE name = 'circ.staff_client.receipt.notice_text';
+
+COMMIT;

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |  2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       | 10 +++---
 ...pdate-receipt-template-setting-descriptions.sql | 36 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1207.data.lp1705302-update-receipt-template-setting-descriptions.sql


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list