[open-ils-commits] [GIT] Evergreen ILS branch master updated. 891d934fca3909043d31602a7d5de1d5ec699d9f

[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  891d934fca3909043d31602a7d5de1d5ec699d9f (commit)
      from  beb0eb34513ce3059cc3cca477c72f8956959d1c (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 891d934fca3909043d31602a7d5de1d5ec699d9f
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri Jun 3 14:16:49 2011 -0400

    Clean up a few stock perm mistakes, part 2
    
    0547 did not completely apply to rel_2_1, so the correction of errant inserts
    from 0545 has been split off into this upgrade instead, for clarity.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 1af405b..5ea5a86 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 ('0547', :eg_version); -- dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0548', :eg_version); -- dbwells
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0547.data.perm_list_cleanup.sql b/Open-ILS/src/sql/Pg/upgrade/0547.data.perm_list_cleanup.sql
index 11d5d4f..3ad43a4 100644
--- a/Open-ILS/src/sql/Pg/upgrade/0547.data.perm_list_cleanup.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0547.data.perm_list_cleanup.sql
@@ -2,13 +2,7 @@ BEGIN;
 
 SELECT evergreen.upgrade_deps_block_check('0547', :eg_version); -- dbwells
 
--- delete errant inserts from 0545 (group 4 is NOT the circulation admin group)
-DELETE FROM permission.grp_perm_map WHERE grp = 4 AND perm IN (
-	SELECT id FROM permission.perm_list
-    WHERE code in ('ABORT_TRANSIT_ON_LOST', 'ABORT_TRANSIT_ON_MISSING')
-);
-
--- now account for spelling errors (Admin != Administrator)
+-- account for spelling errors (Admin != Administrator)
 \qecho This might not insert much if you passed through 0542 on your way here,
 \qecho but one group was missed there as well
 
@@ -121,8 +115,6 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
 		pgt.name = 'Circulation Administrator' AND
 		aout.name = 'Consortium' AND
 		perm.code IN (
-			'ABORT_TRANSIT_ON_LOST',
-			'ABORT_TRANSIT_ON_MISSING',
 			'ADMIN_MAX_FINE_RULE',
 			'CREATE_CIRC_DURATION',
 			'DELETE_CIRC_DURATION',
diff --git a/Open-ILS/src/sql/Pg/upgrade/0548.data.perm_list_cleanup_pt_2.sql b/Open-ILS/src/sql/Pg/upgrade/0548.data.perm_list_cleanup_pt_2.sql
new file mode 100644
index 0000000..96e887d
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0548.data.perm_list_cleanup_pt_2.sql
@@ -0,0 +1,35 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0548', :eg_version); -- dbwells
+
+\qecho This redoes the original part 1 of 0547 which did not apply to rel_2_1,
+\qecho and is being added for the sake of clarity
+
+-- delete errant inserts from 0545 (group 4 is NOT the circulation admin group)
+DELETE FROM permission.grp_perm_map WHERE grp = 4 AND perm IN (
+	SELECT id FROM permission.perm_list
+	WHERE code in ('ABORT_TRANSIT_ON_LOST', 'ABORT_TRANSIT_ON_MISSING')
+);
+
+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 = 'Circulation Administrator' AND
+		aout.name = 'Consortium' AND
+		perm.code IN (
+			'ABORT_TRANSIT_ON_LOST',
+			'ABORT_TRANSIT_ON_MISSING'
+		) AND NOT EXISTS (
+			SELECT 1
+			FROM permission.grp_perm_map AS map
+			WHERE
+				map.grp = pgt.id
+				AND map.perm = perm.id
+		);
+
+COMMIT;

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 .../sql/Pg/upgrade/0547.data.perm_list_cleanup.sql |   10 +-----
 .../upgrade/0548.data.perm_list_cleanup_pt_2.sql   |   35 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0548.data.perm_list_cleanup_pt_2.sql


hooks/post-receive
-- 
Evergreen ILS