[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 22b5b0b235e0e5b3fb8fba97c7aec50977f12d81
Evergreen Git
git at git.evergreen-ils.org
Sat Apr 28 17:25:02 EDT 2012
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_2 has been updated
via 22b5b0b235e0e5b3fb8fba97c7aec50977f12d81 (commit)
from d95ae9ee2c58b5c3ce13a738f4960a5849ca3786 (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 22b5b0b235e0e5b3fb8fba97c7aec50977f12d81
Author: Bill Erickson <berick at esilibrary.com>
Date: Wed Mar 21 16:33:39 2012 -0400
Vandelay match set permission additions
Allow retrieve access for match points with the VIEW_IMPORT_MATCH_SET
permission (in addition to ADMIN_IMPORT_MATCH_SET).
Adds 2 new permissions to the database:
ADMIN_IMPORT_MATCH_SET
VIEW_IMPORT_MATCH_SET
From Jason Stephenson resolving conflicts:
> Conflicts:
>
> Open-ILS/src/sql/Pg/950.data.seed-values.sql
>
> I had to change the ids of the new permissions because another branch
> had used one of the ids since this branch was last rebased. I also edited
> the ids in the upgrade script to match what is in 950.data.seed-values.sql.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index f96d7ea..9223576 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -544,7 +544,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
<actions>
<create permission="ADMIN_IMPORT_MATCH_SET" context_field="owner"/>
- <retrieve permission="ADMIN_IMPORT_MATCH_SET" context_field="owner"/>
+ <retrieve permission="ADMIN_IMPORT_MATCH_SET VIEW_IMPORT_MATCH_SET" context_field="owner"/>
<update permission="ADMIN_IMPORT_MATCH_SET" context_field="owner"/>
<delete permission="ADMIN_IMPORT_MATCH_SET" context_field="owner"/>
</actions>
@@ -575,7 +575,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<create permission="ADMIN_IMPORT_MATCH_SET">
<context link="match_set" field="owner"/>
</create>
- <retrieve permission="ADMIN_IMPORT_MATCH_SET">
+ <retrieve permission="ADMIN_IMPORT_MATCH_SET VIEW_IMPORT_MATCH_SET">
<context link="match_set" field="owner"/>
</retrieve>
<update permission="ADMIN_IMPORT_MATCH_SET">
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 60ffe4a..ba2e621 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -87,7 +87,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 ('0706', :eg_version); -- dbwells/senator
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0707', :eg_version); -- berick/dyrcona/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 e71a359..fafa89f 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1545,7 +1545,11 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
( 527, 'DELETE_PATRON_STAT_CAT_ENTRY_DEFAULT', oils_i18n_gettext( 527,
'User may unset a default entry in a patron statistical category', 'ppl', 'description' )),
( 528, 'ADMIN_ORG_UNIT_CUSTOM_TREE', oils_i18n_gettext( 528,
- 'User may update custom org unit trees', 'ppl', 'description' ));
+ 'User may update custom org unit trees', 'ppl', 'description' )),
+ ( 529, 'ADMIN_IMPORT_MATCH_SET', oils_i18n_gettext( 529,
+ 'Allows a user to create/retrieve/update/delete vandelay match sets', 'ppl', 'description' )),
+ ( 530, 'VIEW_IMPORT_MATCH_SET', oils_i18n_gettext( 530,
+ 'Allows a user to view vandelay match sets', 'ppl', 'description' ));
SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);
diff --git a/Open-ILS/src/sql/Pg/upgrade/0707.data.vandelay_perms_etc.sql b/Open-ILS/src/sql/Pg/upgrade/0707.data.vandelay_perms_etc.sql
new file mode 100644
index 0000000..fe180b7
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0707.data.vandelay_perms_etc.sql
@@ -0,0 +1,29 @@
+-- Evergreen DB patch 0707.schema.acq-vandelay-integration.sql
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0707', :eg_version);
+
+-- seed data --
+
+INSERT INTO permission.perm_list ( id, code, description )
+ VALUES (
+ 529,
+ 'ADMIN_IMPORT_MATCH_SET',
+ oils_i18n_gettext(
+ 529,
+ 'Allows a user to create/retrieve/update/delete vandelay match sets',
+ 'ppl',
+ 'description'
+ )
+ ), (
+ 530,
+ 'VIEW_IMPORT_MATCH_SET',
+ oils_i18n_gettext(
+ 530,
+ 'Allows a user to view vandelay match sets',
+ 'ppl',
+ 'description'
+ )
+ );
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 4 +-
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 6 +++-
.../Pg/upgrade/0707.data.vandelay_perms_etc.sql | 29 ++++++++++++++++++++
4 files changed, 37 insertions(+), 4 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0707.data.vandelay_perms_etc.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list