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

[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  f19e78bb8538c0da8f0612c3b2085b11f9f7dae1 (commit)
       via  3c88bff6a0f463c35c9c8af5ba7053c28cae8a50 (commit)
       via  28e80cf72f4e5f8e341f0b1e77dd52de8a7e823b (commit)
      from  68c9a755de50ab971b4fc63db576d766a084319b (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 f19e78bb8538c0da8f0612c3b2085b11f9f7dae1
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 04e524a..f698180 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 ('0589'); -- scallender/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 3c88bff6a0f463c35c9c8af5ba7053c28cae8a50
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 28e80cf72f4e5f8e341f0b1e77dd52de8a7e823b
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 903a165..d704e2f 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1957,8 +1957,10 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
     'ADMIN_SERIAL_DISTRIBUTION', 'ppl', 'description' )),
  ( 483, 'ADMIN_SERIAL_STREAM', oils_i18n_gettext( 483, 
     'ADMIN_SERIAL_STREAM', 'ppl', 'description' )),
- ( 484, 'RECEIVE_SERIAL', oils_i18n_gettext(484, 'Receive serial items', 'ppl', 'description'));
-
+ ( 484, 'RECEIVE_SERIAL', oils_i18n_gettext(484,
+	'Receive serial items', '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 +2140,7 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
 -- Add basic acquisitions permissions to the Acquisitions group
 SELECT SETVAL('permission.grp_perm_map_id_seq'::TEXT, (SELECT MAX(id) FROM permission.grp_perm_map));
 INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (6, (SELECT id FROM permission.perm_list WHERE code = 'GENERAL_ACQ'), 1, false);
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (6, (SELECT id FROM permission.perm_list WHERE code = 'ACQ_INVOICE_REOPEN'), 1, false);
 INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (6, (SELECT id FROM permission.perm_list WHERE code = 'VIEW_PICKLIST'), 1, false);
 INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (6, (SELECT id FROM permission.perm_list WHERE code = 'CREATE_PICKLIST'), 1, false);
 INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (6, (SELECT id FROM permission.perm_list WHERE code = 'CREATE_PURCHASE_ORDER'), 1, false);

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

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


hooks/post-receive
-- 
Evergreen ILS