[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. f6ca7e0830fae9efe9b0a673b9cf03945dc4a22d
Evergreen Git
git at git.evergreen-ils.org
Mon May 4 13:23:49 EDT 2020
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_3_4 has been updated
via f6ca7e0830fae9efe9b0a673b9cf03945dc4a22d (commit)
via f8fb03e50e04f6911729a4f5c716a0238a4cf1a3 (commit)
from 53af6ea8afdf40c0dd033c2e6dfd55a53af85938 (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 f6ca7e0830fae9efe9b0a673b9cf03945dc4a22d
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Mon May 4 13:20:09 2020 -0400
LP#1873048 - Stamp upgrade script
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 64fd79fa21..ba79e0e176 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1202', :eg_version); -- berick/dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1204', :eg_version); -- jeffdavis/sandbergja/csharp
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.permission.booking_resource.sql b/Open-ILS/src/sql/Pg/upgrade/1204.data.permission.booking_resource.sql
similarity index 83%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.permission.booking_resource.sql
rename to Open-ILS/src/sql/Pg/upgrade/1204.data.permission.booking_resource.sql
index 2bbdce6c6c..985e567798 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.permission.booking_resource.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1204.data.permission.booking_resource.sql
@@ -1,5 +1,5 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1204', :eg_version);
INSERT INTO permission.perm_list ( id, code, description ) VALUES
( 621, 'VIEW_BOOKING_RESOURCE_TYPE', oils_i18n_gettext(621,
commit f8fb03e50e04f6911729a4f5c716a0238a4cf1a3
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date: Thu Apr 30 10:36:44 2020 -0700
LP#1873048: add scoped retrieve perms for booking resource types and resources
In the XUL client, when selecting a resource type, the list was limited
by owning library. But in the web client, the list would show all
resource types across all libraries. This commit addresses that
regression by adding a new VIEW_BOOKING_RESOURCE_TYPE permission with
context_field in the IDL. That way, users only see resource types owned
by org units where they have the permission.
While we're at it, a new VIEW_BOOKING_RESOURCE perm is also added for
resources.
Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index cc7f2717ca..856c2128ca 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -5010,7 +5010,7 @@ SELECT usr,
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
<actions>
<create permission="ADMIN_BOOKING_RESOURCE_TYPE" context_field='owner'/>
- <retrieve/>
+ <retrieve permission="VIEW_BOOKING_RESOURCE_TYPE" context_field='owner'/>
<update permission="ADMIN_BOOKING_RESOURCE_TYPE" context_field='owner'/>
<delete permission="ADMIN_BOOKING_RESOURCE_TYPE" context_field='owner'/>
</actions>
@@ -5042,7 +5042,7 @@ SELECT usr,
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
<actions>
<create permission="ADMIN_BOOKING_RESOURCE" context_field='owner'/>
- <retrieve/>
+ <retrieve permission="VIEW_BOOKING_RESOURCE" context_field='owner'/>
<update permission="ADMIN_BOOKING_RESOURCE" context_field='owner'/>
<delete permission="ADMIN_BOOKING_RESOURCE" context_field='owner'/>
</actions>
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 16d97c11a5..a9c1add110 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1933,7 +1933,11 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
( 618, 'CREATE_PRECAT', oils_i18n_gettext(618,
'Allows a user to create a pre-catalogued copy', 'ppl', 'description')),
( 619, 'EDIT_SELF_IN_CLIENT', oils_i18n_gettext(619,
- 'Allow a user to edit their own account in the staff client', 'ppl', 'description'))
+ 'Allow a user to edit their own account in the staff client', 'ppl', 'description')),
+ ( 621, 'VIEW_BOOKING_RESOURCE_TYPE', oils_i18n_gettext(621,
+ 'View booking resource types', 'ppl', 'description')),
+ ( 622, 'VIEW_BOOKING_RESOURCE', oils_i18n_gettext(622,
+ 'View booking resources', 'ppl', 'description'))
;
@@ -2367,6 +2371,8 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
'UPDATE_PAYMENT_NOTE',
'UPDATE_PICKUP_LIB FROM_TRANSIT',
'UPDATE_PICKUP_LIB_FROM_HOLDS_SHELF',
+ 'VIEW_BOOKING_RESOURCE',
+ 'VIEW_BOOKING_RESOURCE_TYPE',
'VIEW_GROUP_PENALTY_THRESHOLD',
'VIEW_STANDING_PENALTY',
'VOID_BILLING',
@@ -2527,6 +2533,8 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
'UPDATE_PICKUP_LIB_FROM_HOLDS_SHELF',
'UPDATE_PICKUP_LIB_FROM_TRANSIT',
'UPDATE_USER',
+ 'VIEW_BOOKING_RESOURCE',
+ 'VIEW_BOOKING_RESOURCE_TYPE',
'VIEW_REPORT_OUTPUT',
'VIEW_STANDING_PENALTY',
'VOID_BILLING',
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.permission.booking_resource.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.permission.booking_resource.sql
new file mode 100644
index 0000000000..2bbdce6c6c
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.permission.booking_resource.sql
@@ -0,0 +1,11 @@
+BEGIN;
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES
+ ( 621, 'VIEW_BOOKING_RESOURCE_TYPE', oils_i18n_gettext(621,
+ 'View booking resource types', 'ppl', 'description')),
+ ( 622, 'VIEW_BOOKING_RESOURCE', oils_i18n_gettext(622,
+ 'View booking resources', '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 | 10 +++++++++-
.../sql/Pg/upgrade/1204.data.permission.booking_resource.sql | 11 +++++++++++
4 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1204.data.permission.booking_resource.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list