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, main has been updated via 636bf685ff4f01272eb074b96ec85bfff3b2c2fa (commit) via b55831e0f0c1006f29c9e45f80488969830d58ae (commit) via bd916a6edc9fb8b5a34565296043a973bcec1723 (commit) via 9a99ed1f510cc7b16e7f59ecf904eb69a97fbebb (commit) from acfc65267f10cb02c0754481d7a461b45b93f58d (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 636bf685ff4f01272eb074b96ec85bfff3b2c2fa Author: Jane Sandberg <sandbergja@gmail.com> Date: Sun May 25 08:19:09 2025 -0700 LP#1289651: stamp upgrade script Signed-off-by: Jane Sandberg <sandbergja@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 01eed66e7e..954b990d67 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 ('1469', :eg_version); -- dbriem/edavis/tmccanna +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1470', :eg_version); -- bmagic/miker/sandbergja CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.hard_due_date_values_perms.sql b/Open-ILS/src/sql/Pg/upgrade/1470.hard_due_date_values_perms.sql similarity index 94% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.hard_due_date_values_perms.sql rename to Open-ILS/src/sql/Pg/upgrade/1470.hard_due_date_values_perms.sql index c4b5291118..52a4c6d7cd 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.hard_due_date_values_perms.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1470.hard_due_date_values_perms.sql @@ -1,6 +1,6 @@ BEGIN; --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1470', :eg_version); INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 688, 'UPDATE_HARD_DUE_DATE', oils_i18n_gettext(688, @@ -35,4 +35,4 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) 'UPDATE_HARD_DUE_DATE_VALUE' ); -COMMIT; \ No newline at end of file +COMMIT; commit b55831e0f0c1006f29c9e45f80488969830d58ae Author: Jane Sandberg <sandbergja@gmail.com> Date: Sun May 25 08:12:51 2025 -0700 LP#1289651 follow-up: still allow users with *_CIRC_DURATION permissions to work with hard due dates If a user previously had, say, CREATE_CIRC_DURATION, but was not in a group called Circulation Administrators, they would lose their ability to create hard due dates and hard due date values. This commit adds *_CIRC_DURATION permissions to the list of permissions that can allow a user to work with hard due dates, for backwards compatibility. Signed-off-by: Jane Sandberg <sandbergja@gmail.com> diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 477a05af8c..06773cf4d3 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -4018,10 +4018,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA </links> <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1"> <actions> - <create permission="CREATE_HARD_DUE_DATE" context_field="owner"/> + <create permission="CREATE_HARD_DUE_DATE CREATE_CIRC_DURATION" context_field="owner"/> <retrieve/> - <update permission="UPDATE_HARD_DUE_DATE" context_field="owner"/> - <delete permission="DELETE_HARD_DUE_DATE" context_field="owner"/> + <update permission="UPDATE_HARD_DUE_DATE UPDATE_CIRC_DURATION" context_field="owner"/> + <delete permission="DELETE_HARD_DUE_DATE DELETE_CIRC_DURATION" context_field="owner"/> </actions> </permacrud> </class> @@ -4038,14 +4038,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA </links> <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1"> <actions> - <create permission="CREATE_HARD_DUE_DATE_VALUE"> + <create permission="CREATE_HARD_DUE_DATE_VALUE CREATE_CIRC_DURATION"> <context link="hard_due_date" field="owner"/> </create> <retrieve/> - <update permission="UPDATE_HARD_DUE_DATE_VALUE"> + <update permission="UPDATE_HARD_DUE_DATE_VALUE UPDATE_CIRC_DURATION"> <context link="hard_due_date" field="owner"/> </update> - <delete permission="DELETE_HARD_DUE_DATE_VALUE"> + <delete permission="DELETE_HARD_DUE_DATE_VALUE DELETE_CIRC_DURATION"> <context link="hard_due_date" field="owner"/> </delete> </actions> commit bd916a6edc9fb8b5a34565296043a973bcec1723 Author: Mike Rylander <mrylander@gmail.com> Date: Fri May 23 15:47:02 2025 -0400 LP#1289651: Hard Due Date ease-of-use improvement To encourge the use of "here" when adding new hard due date windows, tell the admin interface to default the owner to the current org filter value. Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Jane Sandberg <sandbergja@gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts index c02bfa7c78..3041ed6c34 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts @@ -38,7 +38,8 @@ const routes: Routes = [{ data: [{ schema: 'config', table: 'hard_due_date', - fieldOrder: 'name,owner,ceiling_date,forceto' + fieldOrder: 'name,owner,ceiling_date,forceto', + orgFieldsDefaultingToContextOrg: 'owner' }] }, { path: 'config/print_template', commit 9a99ed1f510cc7b16e7f59ecf904eb69a97fbebb Author: blake <blake@mobiusconsortium.org> Date: Sat May 17 16:54:46 2025 -0500 LP#1289651: Hard Due Date Permissions Introducing more granular permission sets for hard due dates and hard due date values. Also synced permission.perm_list with the appendix documentation page Release-note: Hard due date and hard due date values now have their own permission sets. Signed-off-by: blake <blake@mobiusconsortium.org> Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Jane Sandberg <sandbergja@gmail.com> diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 35b82142ab..477a05af8c 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -4018,10 +4018,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA </links> <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1"> <actions> - <create permission="CREATE_CIRC_DURATION" global_required="true"/> + <create permission="CREATE_HARD_DUE_DATE" context_field="owner"/> <retrieve/> - <update permission="UPDATE_CIRC_DURATION" global_required="true"/> - <delete permission="DELETE_CIRC_DURATION" global_required="true"/> + <update permission="UPDATE_HARD_DUE_DATE" context_field="owner"/> + <delete permission="DELETE_HARD_DUE_DATE" context_field="owner"/> </actions> </permacrud> </class> @@ -4038,10 +4038,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA </links> <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1"> <actions> - <create permission="CREATE_CIRC_DURATION" global_required="true"/> + <create permission="CREATE_HARD_DUE_DATE_VALUE"> + <context link="hard_due_date" field="owner"/> + </create> <retrieve/> - <update permission="UPDATE_CIRC_DURATION" global_required="true"/> - <delete permission="DELETE_CIRC_DURATION" global_required="true"/> + <update permission="UPDATE_HARD_DUE_DATE_VALUE"> + <context link="hard_due_date" field="owner"/> + </update> + <delete permission="DELETE_HARD_DUE_DATE_VALUE"> + <context link="hard_due_date" field="owner"/> + </delete> </actions> </permacrud> </class> 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 a57aaafb5d..9b6fe4dcc5 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -2044,7 +2044,19 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 675, 'VIEW_CONTAINER_USER_ORG_SHARE', oils_i18n_gettext(675, 'Allow viewing of user bucket user shares', 'ppl', 'description')), ( 676, 'UPDATE_TOP_OF_QUEUE', oils_i18n_gettext(676, - 'Allow setting and unsetting hold from top of hold queue (cut in line)', 'ppl', 'description')) + 'Allow setting and unsetting hold from top of hold queue (cut in line)', 'ppl', 'description')), + ( 688, 'UPDATE_HARD_DUE_DATE', oils_i18n_gettext(688, + 'Allow update hard due dates', 'ppl', 'description')), + ( 689, 'CREATE_HARD_DUE_DATE', oils_i18n_gettext(689, + 'Allow create hard due dates', 'ppl', 'description')), + ( 690, 'DELETE_HARD_DUE_DATE', oils_i18n_gettext(690, + 'Allow delete hard due dates', 'ppl', 'description')), + ( 691, 'UPDATE_HARD_DUE_DATE_VALUE', oils_i18n_gettext(691, + 'Allow update hard due date values', 'ppl', 'description')), + ( 692, 'CREATE_HARD_DUE_DATE_VALUE', oils_i18n_gettext(692, + 'Allow create hard due date values', 'ppl', 'description')), + ( 693, 'DELETE_HARD_DUE_DATE_VALUE', oils_i18n_gettext(693, + 'Allow delete hard due date values', 'ppl', 'description')) ; INSERT INTO permission.perm_list (id,code) VALUES @@ -2658,6 +2670,8 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) 'COPY_TRANSIT_RECEIVE', 'CREATE_BILL', 'CREATE_BILLING_TYPE', + 'CREATE_HARD_DUE_DATE', + 'CREATE_HARD_DUE_DATE_VALUE', 'CREATE_NON_CAT_TYPE', 'CREATE_PATRON_STAT_CAT', 'CREATE_PATRON_STAT_CAT_ENTRY', @@ -2665,6 +2679,8 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) 'CREATE_PATRON_STAT_CAT_ENTRY_MAP', 'CREATE_USER_GROUP_LINK', 'DELETE_BILLING_TYPE', + 'DELETE_HARD_DUE_DATE', + 'DELETE_HARD_DUE_DATE_VALUE', 'DELETE_NON_CAT_TYPE', 'DELETE_PATRON_STAT_CAT', 'DELETE_PATRON_STAT_CAT_ENTRY', @@ -2696,6 +2712,8 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) 'SET_CIRC_LOST', 'UNBAR_PATRON', 'UPDATE_BILL_NOTE', + 'UPDATE_HARD_DUE_DATE', + 'UPDATE_HARD_DUE_DATE_VALUE', 'UPDATE_NON_CAT_TYPE', 'UPDATE_PATRON_CLAIM_NEVER_CHECKED_OUT_COUNT', 'UPDATE_PATRON_CLAIM_RETURN_COUNT', diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.hard_due_date_values_perms.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.hard_due_date_values_perms.sql new file mode 100644 index 0000000000..c4b5291118 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.hard_due_date_values_perms.sql @@ -0,0 +1,38 @@ +BEGIN; + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +INSERT INTO permission.perm_list ( id, code, description ) VALUES + ( 688, 'UPDATE_HARD_DUE_DATE', oils_i18n_gettext(688, + 'Allow update hard due dates', 'ppl', 'description')), + ( 689, 'CREATE_HARD_DUE_DATE', oils_i18n_gettext(689, + 'Allow create hard due dates', 'ppl', 'description')), + ( 690, 'DELETE_HARD_DUE_DATE', oils_i18n_gettext(690, + 'Allow delete hard due dates', 'ppl', 'description')), + ( 691, 'UPDATE_HARD_DUE_DATE_VALUE', oils_i18n_gettext(691, + 'Allow update hard due date values', 'ppl', 'description')), + ( 692, 'CREATE_HARD_DUE_DATE_VALUE', oils_i18n_gettext(692, + 'Allow create hard due date values', 'ppl', 'description')), + ( 693, 'DELETE_HARD_DUE_DATE_VALUE', oils_i18n_gettext(693, + 'Allow delete hard due date values', '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 = 'Circulation Administrator' AND + aout.name = 'System' AND + perm.code IN ( + 'CREATE_HARD_DUE_DATE', + 'DELETE_HARD_DUE_DATE', + 'UPDATE_HARD_DUE_DATE', + 'CREATE_HARD_DUE_DATE_VALUE', + 'DELETE_HARD_DUE_DATE_VALUE', + 'UPDATE_HARD_DUE_DATE_VALUE' + ); + +COMMIT; \ No newline at end of file diff --git a/docs/modules/admin_initial_setup/pages/hard_due_dates.adoc b/docs/modules/admin_initial_setup/pages/hard_due_dates.adoc index 9ac6acb018..856f2361b2 100644 --- a/docs/modules/admin_initial_setup/pages/hard_due_dates.adoc +++ b/docs/modules/admin_initial_setup/pages/hard_due_dates.adoc @@ -3,7 +3,9 @@ This feature allows you to specify a specific due date within your circulation policies. This is particularly useful for academic and school libraries, who may wish to make certain items due at the end of a semester or term. -NOTE: To work with hard due dates, you will need the CREATE_CIRC_DURATION, UPDATE_CIRC_DURATION, and DELETE_CIRC_DURATION permissions at the _consortium_ level. +NOTE: To work with hard due dates, you will need the CREATE_HARD_DUE_DATE, UPDATE_HARD_DUE_DATE, and DELETE_HARD_DUE_DATE permissions for your branch/system or consortium. + +NOTE: To work with hard due date _values_, you will need the CREATE_HARD_DUE_DATE_VALUE, UPDATE_HARD_DUE_DATE_VALUE, and DELETE_HARD_DUE_DATE_VALUE permissions for your branch/system or consortium. == Creating a hard due date == Setting up hard due dates is a two-step process. You must first create a hard due date, and then populate it with specific values. @@ -15,7 +17,7 @@ To create a hard due date: . In the *Name* field, enter a name for your hard due date. Note that each hard due date can have multiple values, so it's best to use a generic name here, such as "End of semester." . In the *Owner* field, select the appropriate organizational unit for your new hard due date. . In the *Current Ceiling Date* field, select any value. This field is required, but its value will be overwritten in subsequent steps, so you may enter an arbitrary date here. -. Check the *Always Use?* checkbox if you want items to only receive the due dates you specify, regardless of when they would ordinarily be due. If you leave this box unchecked, your specified due dates will serve as "ceiling" values that limit, rather than override, other circulation rules. In other words, with this box checked, items may be due only on the specified dates. With the box unchecked, items may be due _on or before_ the specified dates, simply not after. +. Choose "Yes" for *Always Use?* if you want items to only receive the due dates you specify, regardless of when they would ordinarily be due. "Yes" means items will be due on the specified dates. "No" means items may be due _on or before_ the specified dates, not after. Choosing neither or choosing "No" have the same meaning. . Click *Save*. To add date values to your hard due date: diff --git a/docs/modules/appendix/pages/permissions_list.adoc b/docs/modules/appendix/pages/permissions_list.adoc index 16a14aecfc..0a571ad5f9 100644 --- a/docs/modules/appendix/pages/permissions_list.adoc +++ b/docs/modules/appendix/pages/permissions_list.adoc @@ -495,6 +495,10 @@ allocations *CREATE_FUNDING_SOURCE.* Allows an acquisitions user to create funding sources +*CREATE_HARD_DUE_DATE.* Allows a user to create hard due dates + +*CREATE_HARD_DUE_DATE_VALUE.* Allows a user to create hard due date values + *CREATE_HOLD_NOTIFICATION.* Allows a user to create new hold notifications @@ -740,6 +744,10 @@ allocations *DELETE_FUNDING_SOURCE.* Allows a user to delete funding sources +*DELETE_HARD_DUE_DATE.* Allows a user to delete hard due dates + +*DELETE_HARD_DUE_DATE_VALUE.* Allows a user to delete hard due date values + *DELETE_HOLDS.* Allows a user to delete holds *DELETE_HOURS_OF_OPERATION.* Allows a user to delete (clear) hours of @@ -1202,6 +1210,10 @@ sources *UPDATE_GROUP_PERM.* Allows a user to edit permission depth and grantability +*UPDATE_HARD_DUE_DATE.* Allows a user to update hard due dates + +*UPDATE_HARD_DUE_DATE_VALUE.* Allows a user to update hard due date values + *UPDATE_HOLD.* Allows a user to edit another user's holds *UPDATE_HOLD_REQUEST_TIME.* Allows a user to edit a hold's request date, ----------------------------------------------------------------------- Summary of changes: Open-ILS/examples/fm_IDL.xml | 18 ++++++---- .../src/app/staff/admin/server/routing.module.ts | 3 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 20 +++++++++++- .../Pg/upgrade/1470.hard_due_date_values_perms.sql | 38 ++++++++++++++++++++++ .../admin_initial_setup/pages/hard_due_dates.adoc | 6 ++-- docs/modules/appendix/pages/permissions_list.adoc | 12 +++++++ 7 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1470.hard_due_date_values_perms.sql hooks/post-receive -- Evergreen ILS