[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. f805b8be242f9eb2a7bca5e079ef61338d955fad

[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_1 has been updated
       via  f805b8be242f9eb2a7bca5e079ef61338d955fad (commit)
       via  6d088de1bccbacb9e65d9da38bebf820fa4bac0c (commit)
       via  f826be7ad694d0da2042613e4f3f12dcf66fde65 (commit)
      from  792dbb7638305abab5307674fdbebc00e6f8e0fa (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 f805b8be242f9eb2a7bca5e079ef61338d955fad
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu Aug 4 15:14:05 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 4774c26..9a5f74a 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 ('0591'); -- berick/miker
+INSERT INTO config.upgrade_log (version) VALUES ('0592'); -- mrpeters-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 90%
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..d7e7d38 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;
 
+INSERT INTO config.upgrade_log (version) VALUES ('0592');
+
 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 6d088de1bccbacb9e65d9da38bebf820fa4bac0c
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 f826be7ad694d0da2042613e4f3f12dcf66fde65
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>

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 478ef8a..8bd4112 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1429,8 +1429,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 506, 'VIEW_USER_SETTING_TYPE', oils_i18n_gettext(506,
     'Allows viewing of configurable user setting types.', 'ppl', 'description')),
  ( 510, 'UPDATE_PATRON_COLLECTIONS_EXEMPT', oils_i18n_gettext(510,
-    'Allows a user to indicate that a patron is exempt from collections processing', 'ppl', 'description'));
-
+    'Allows a user to indicate that a patron is exempt from collections processing', '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);
 
@@ -2138,6 +2139,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