[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1e140ad8693d616229c511166ad1284ecfb609a5

[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  1e140ad8693d616229c511166ad1284ecfb609a5 (commit)
       via  7613838f067f37db3a024075559430662c3d87e0 (commit)
       via  a0f7fa7d5e157777ff38a22bd6f180e1b5d98028 (commit)
      from  efdf2b16c664924ee66fa2e48a8da343aa16a43d (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 1e140ad8693d616229c511166ad1284ecfb609a5
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu Aug 4 15:10:36 2011 -0400

    Stamped upgrade script for ACQ_INVOICE_REOPEN permission addition
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index b0991d1..950947e 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,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 ('0591', :eg_version); -- berick/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0592', :eg_version); -- mrperters-isl/miker
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.lp818311.sql b/Open-ILS/src/sql/Pg/upgrade/0592.data.ACQ_INVOICE_REOPEN-perm.sql
similarity index 89%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.lp818311.sql
rename to Open-ILS/src/sql/Pg/upgrade/0592.data.ACQ_INVOICE_REOPEN-perm.sql
index 4e7887e..5bc68df 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.lp818311.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0592.data.ACQ_INVOICE_REOPEN-perm.sql
@@ -2,6 +2,8 @@
 
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('0592', :eg_version);
+
 INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 512, 'ACQ_INVOICE_REOPEN', oils_i18n_gettext( 512,
     'Allows a user to reopen an Acquisitions invoice', 'ppl', 'description' ));

commit 7613838f067f37db3a024075559430662c3d87e0
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Thu Aug 4 10:13:56 2011 -0400

    Upgrade script for LP818311 branch.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.lp818311.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.lp818311.sql
new file mode 100644
index 0000000..4e7887e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.lp818311.sql
@@ -0,0 +1,21 @@
+--Upgrade script for lp818311.
+
+BEGIN;
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES
+ ( 512, 'ACQ_INVOICE_REOPEN', oils_i18n_gettext( 512,
+    'Allows a user to reopen an Acquisitions invoice', 'ppl', 'description' ));
+
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
+	SELECT
+		pgt.id, perm.id, aout.depth, TRUE
+	FROM
+		permission.grp_tree pgt,
+		permission.perm_list perm,
+		actor.org_unit_type aout
+	WHERE
+		pgt.name = 'Acquisitions Administrator' AND
+		aout.name = 'Consortium' AND
+		perm.code = 'ACQ_INVOICE_REOPEN';
+
+COMMIT;

commit a0f7fa7d5e157777ff38a22bd6f180e1b5d98028
Author: Michael Peters <mrpeters at library.in.gov>
Date:   Thu Aug 4 08:59:15 2011 -0400

    LP#818311:  ACQ_INVOICE_REOPEN is missing
    
    This patch adds the missing ACQ_INVOICE_REOPEN to the Acquisitions
    Administrator user.
    
    Signed-off-by: Michael Peters <mrpeters at library.in.gov>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

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 65fe867..43f9634 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1438,8 +1438,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 510, 'UPDATE_PATRON_COLLECTIONS_EXEMPT', oils_i18n_gettext(510,
     'Allows a user to indicate that a patron is exempt from collections processing', 'ppl', 'description')),
  ( 511, 'PERSISTENT_LOGIN', oils_i18n_gettext( 511,
-    'Allows a user to authenticate and get a long-lived session (length configured in opensrf.xml)', 'ppl', 'description' ));
-
+    'Allows a user to authenticate and get a long-lived session (length configured in opensrf.xml)', 'ppl', 'description' )),
+ ( 512, 'ACQ_INVOICE_REOPEN', oils_i18n_gettext( 512,
+    'Allows a user to reopen an Acquisitions invoice', 'ppl', 'description' ));
 
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);
 
@@ -2151,6 +2152,7 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
 		pgt.name = 'Acquisitions Administrator' AND
 		aout.name = 'Consortium' AND
 		perm.code IN (
+			'ACQ_INVOICE_REOPEN',
 			'ACQ_XFER_MANUAL_DFUND_AMOUNT',
 			'ADMIN_ACQ_CANCEL_CAUSE',
 			'ADMIN_ACQ_CLAIM',

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    6 +++-
 .../upgrade/0592.data.ACQ_INVOICE_REOPEN-perm.sql  |   23 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0592.data.ACQ_INVOICE_REOPEN-perm.sql


hooks/post-receive
-- 
Evergreen ILS