[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 5edf24fa1ebf3c12c8840ffcf1d9f32d534ef6dc

[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, rel_2_0 has been updated
       via  5edf24fa1ebf3c12c8840ffcf1d9f32d534ef6dc (commit)
      from  cc435b591efba0fb8a60e8546ad97778926c6b0c (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 5edf24fa1ebf3c12c8840ffcf1d9f32d534ef6dc
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Fri May 20 15:47:04 2011 -0400

    Fix bad seed data in an A/T template
    
    The action_trigger event def template for printing acq invoices was
    syntatically broken.  The collapse filter isn't important per se, but
    it balances the extra [% END %] at the bottom of the template, and it
    was there originally, and I see no reason not to put it back.
    
    Incidentally, maybe the database upgrade script in the commit will be
    the first in master to successfully use the new
    evergreen.upgrade_deps_block_check() function ?
    
    Reported by Sally Fortin.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ab658d7..e63436b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0535'); -- dbs
+INSERT INTO config.upgrade_log (version) VALUES ('0538'); -- senator
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
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 77f431c..885cb3b 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4565,6 +4565,7 @@ INSERT INTO action_trigger.event_definition (
         'ProcessTemplate',
         'print-on-demand',
 $$
+[% FILTER collapse %]
 [%- SET invoice = target -%]
 <!-- This lacks general refinement -->
 <div class="acq-invoice-voucher">
diff --git a/Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql b/Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql
new file mode 100644
index 0000000..43b5079
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql
@@ -0,0 +1,10 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0538', :eg_version); -- senator
+
+UPDATE action_trigger.event_definition
+SET template = '[% FILTER collapse %]' || template
+WHERE id = 22 AND
+    SUBSTR(template, 0, 24) NOT LIKE '%FILTER collapse%';
+
+COMMIT;

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    1 +
 .../0538.data.at-event-def-acq-invoice-print.sql   |   10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql


hooks/post-receive
-- 
Evergreen ILS