From cb518ba3b9121f458938c504f7ab3496e6d1a1ef Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Wed, 29 Jul 2020 14:37:40 -0400 Subject: [PATCH] LP#1838995: Change end-user terminology After a community suggestion and weighing some options, this commit changes the end-user visible terminology of mixed "batch holds" (the prevailing staff-side term) and "hold subscriptions" (the pevailing patron-side term) to the single term "hold groups". Signed-off-by: Mike Rylander --- Open-ILS/examples/fm_IDL.xml | 10 ++++----- .../perlmods/lib/OpenILS/Application/Circ/Holds.pm | 8 +++---- .../lib/OpenILS/WWW/EGCatLoader/Account.pm | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 10 ++++----- .../src/sql/Pg/upgrade/XXXX.data.hold_buckets.sql | 10 ++++----- Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 | 2 +- .../templates/opac/myopac/ebook_holds_ready.tt2 | 2 +- .../src/templates/opac/myopac/hold_history.tt2 | 2 +- .../templates/opac/myopac/hold_subscriptions.tt2 | 6 ++--- Open-ILS/src/templates/opac/myopac/holds.tt2 | 2 +- Open-ILS/src/templates/opac/parts/place_hold.tt2 | 4 ++-- .../staff/cat/bucket/batch_hold/index.tt2 | 10 ++++----- .../staff/cat/bucket/batch_hold/t_bucket_info.tt2 | 4 ++-- .../staff/cat/bucket/batch_hold/t_event.tt2 | 4 ++-- .../staff/cat/bucket/batch_hold/t_event_create.tt2 | 2 +- .../staff/cat/bucket/batch_hold/t_grid_menu.tt2 | 8 +++---- .../staff/cat/bucket/batch_hold/t_list.tt2 | 2 +- .../staff/cat/bucket/batch_hold/t_pending.tt2 | 4 ++-- .../staff/cat/bucket/batch_hold/t_view.tt2 | 2 +- Open-ILS/src/templates/staff/circ/patron/index.tt2 | 4 ++-- .../staff/circ/patron/t_hold_subscriptions.tt2 | 4 ++-- .../staff/circ/patron/t_search_results.tt2 | 2 +- Open-ILS/src/templates/staff/navbar.tt2 | 2 +- .../ui/default/staff/cat/bucket/batch_hold/app.js | 2 +- .../js/ui/default/staff/services/user-bucket.js | 2 +- .../Circulation/hold-subscriptions.adoc | 26 +++++++++++----------- 26 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index a72dbd652c..d8228da48a 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -7288,7 +7288,7 @@ SELECT usr, - + @@ -7306,14 +7306,14 @@ SELECT usr, - + - - + + - + diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm index fdab54d6c8..45175e1243 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm @@ -216,8 +216,8 @@ sub test_and_create_batch_hold_event { my $org = $e->requestor->ws_ou || $e->requestor->home_ou; # the perm locaiton shouldn't really matter here since holds - # will exist all over and MANAGE_BATCH_HOLDS should be universal - my $evt = $U->check_perms($e->requestor->id, $org, 'MANAGE_BATCH_HOLDS'); + # will exist all over and MANAGE_HOLD_GROUPS should be universal + my $evt = $U->check_perms($e->requestor->id, $org, 'MANAGE_HOLD_GROUPS'); return $evt if $evt; my $rand_setting = $U->ou_ancestor_setting_value($org, 'holds.subscription.randomize'); @@ -372,7 +372,7 @@ __PACKAGE__->register_method( desc => q/This is for batch creating a set of holds where every field is identical except for the target users./, params => [ { desc => 'Authentication token', type => 'string' }, - { desc => 'Batch Hold Event ID to roll back', type => 'number' }, + { desc => 'Hold Group Event ID to roll back', type => 'number' }, ], return => { desc => 'Stream of objects structured as {total=>X, count=>Y} on success, event on error', @@ -387,7 +387,7 @@ sub rollback_batch_hold_event { return $e->die_event unless $e->checkauth; my $org = $e->requestor->ws_ou || $e->requestor->home_ou; - my $evt = $U->check_perms($e->requestor->id, $org, 'MANAGE_BATCH_HOLDS'); + my $evt = $U->check_perms($e->requestor->id, $org, 'MANAGE_HOLD_GROUPS'); return $evt if $evt; my $batch_event = $e->retrieve_action_batch_hold_event($event_id); diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm index d3ead5c598..11b79e02b7 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm @@ -1588,7 +1588,7 @@ sub load_place_hold { if ($ctx->{hold_subscription}) { # this is a batch event, hold "user" is a bucket id - $logger->info("Hold Subscription Event requested for user bucket: " . $ctx->{hold_subscription}); + $logger->info("Hold Group Event requested for user bucket: " . $ctx->{hold_subscription}); $usr = $e->retrieve_container_user_bucket($ctx->{hold_subscription}); } } 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 b116b07247..2fbd1011ba 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1940,7 +1940,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES 'View booking resource types', 'ppl', 'description')), ( 622, 'VIEW_BOOKING_RESOURCE', oils_i18n_gettext(622, 'View booking resources', 'ppl', 'description')), - ( 623, 'MANAGE_BATCH_HOLDS', oils_i18n_gettext(623, + ( 623, 'MANAGE_HOLD_GROUPS', oils_i18n_gettext(623, 'Manage batch (subscription) hold events', 'ppl', 'description')) ; @@ -2855,7 +2855,7 @@ INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (4, oils_i18n_get INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (5, oils_i18n_gettext(5, 'Staff forced', 'ahrcc', 'label')); INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (6, oils_i18n_gettext(6, 'Patron via OPAC', 'ahrcc', 'label')); INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (7, oils_i18n_gettext(7, 'Patron via SIP', 'ahrcc', 'label')); -INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (8, oils_i18n_gettext(8, 'Subscription Event rollback', 'ahrcc', 'label')); +INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (8, oils_i18n_gettext(8, 'Hold Group Event rollback', 'ahrcc', 'label')); SELECT SETVAL('action.hold_request_cancel_cause_id_seq', 100); @@ -5734,7 +5734,7 @@ INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:hold.view', o INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:hold.cancel', oils_i18n_gettext('folks:hold.cancel', 'Cancel Holds', 'cubt', 'label')); INSERT INTO container.user_bucket_type (code,label) SELECT code,label FROM container.copy_bucket_type where code = 'staff_client'; -INSERT INTO container.user_bucket_type (code,label) VALUES ('hold_subscription', oils_i18n_gettext('hold_subscription', 'Hold Subscription Container', 'cubt', 'label')); +INSERT INTO container.user_bucket_type (code,label) VALUES ('hold_subscription', oils_i18n_gettext('hold_subscription', 'Hold Group Container', 'cubt', 'label')); ---------------------------------- -- MARC21 record structure data -- @@ -17155,7 +17155,7 @@ INSERT INTO action_trigger.environment ( ); INSERT INTO action_trigger.event_definition (active, owner, name, hook, validator, reactor, delay, delay_field, group_field, cleanup_success, template) - VALUES ('f', 1, 'Subscription Hold Placed for Patron Email Notification', 'hold_request.success', 'NOOP_True', 'SendEmail', '30 minutes', 'request_time', 'usr', 'CreateHoldNotification', + VALUES ('f', 1, 'Hold Group Hold Placed for Patron Email Notification', 'hold_request.success', 'NOOP_True', 'SendEmail', '30 minutes', 'request_time', 'usr', 'CreateHoldNotification', $$ [%- USE date -%] [%- user = target.0.usr -%] @@ -17188,7 +17188,7 @@ INSERT INTO action_trigger.event_definition ( active, owner, name, hook, validator, reactor, cleanup_success, delay, delay_field, group_field, template ) VALUES ( - false, 1, 'Subscription Hold Placed for Patron SMS Notification', 'hold_request.success', 'NOOP_True', + false, 1, 'Hold Group Hold Placed for Patron SMS Notification', 'hold_request.success', 'NOOP_True', 'SendSMS', 'CreateHoldNotification', '00:30:00', 'shelf_time', 'sms_notify', '[%- USE date -%] [%- user = target.0.usr -%] diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.hold_buckets.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.hold_buckets.sql index f48fe33b44..9337cf7640 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.hold_buckets.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.hold_buckets.sql @@ -17,7 +17,7 @@ CREATE TABLE action.batch_hold_event_map ( hold INT NOT NULL REFERENCES action.hold_request (id) ON UPDATE CASCADE ON DELETE CASCADE ); -INSERT INTO container.user_bucket_type (code,label) VALUES ('hold_subscription','Hold Subscription Container'); +INSERT INTO container.user_bucket_type (code,label) VALUES ('hold_subscription','Hold Group Container'); INSERT INTO config.org_unit_setting_type (name, label, description, grp, datatype) @@ -41,13 +41,13 @@ VALUES ( -- Committer! Verify permission id before pushing! INSERT INTO permission.perm_list (id,code,description) - VALUES ( 623, 'MANAGE_BATCH_HOLDS', oils_i18n_gettext(623, 'Manage batch (subscription) hold events', 'ppl', 'description')); + VALUES ( 623, 'MANAGE_HOLD_GROUPS', oils_i18n_gettext(623, 'Manage hold groups and hold group events', 'ppl', 'description')); INSERT INTO action.hold_request_cancel_cause (id,label) - VALUES ( 8, oils_i18n_gettext(8, 'Subscription Event rollback', 'ahrcc', 'label')); + VALUES ( 8, oils_i18n_gettext(8, 'Hold Group Event rollback', 'ahrcc', 'label')); INSERT INTO action_trigger.event_definition (active, owner, name, hook, validator, reactor, delay, delay_field, group_field, cleanup_success, template) - VALUES ('f', 1, 'Subscription Hold Placed for Patron Email Notification', 'hold_request.success', 'NOOP_True', 'SendEmail', '30 minutes', 'request_time', 'usr', 'CreateHoldNotification', + VALUES ('f', 1, 'Hold Group Hold Placed for Patron Email Notification', 'hold_request.success', 'NOOP_True', 'SendEmail', '30 minutes', 'request_time', 'usr', 'CreateHoldNotification', $$ [%- USE date -%] [%- user = target.0.usr -%] @@ -81,7 +81,7 @@ INSERT INTO action_trigger.event_definition ( active, owner, name, hook, validator, reactor, cleanup_success, delay, delay_field, group_field, template ) VALUES ( - false, 1, 'Subscription Hold Placed for Patron SMS Notification', 'hold_request.success', 'NOOP_True', + false, 1, 'Hold Group Hold Placed for Patron SMS Notification', 'hold_request.success', 'NOOP_True', 'SendSMS', 'CreateHoldNotification', '00:30:00', 'shelf_time', 'sms_notify', '[%- USE date -%] [%- user = target.0.usr -%] diff --git a/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 b/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 index 3cc6a83c67..95dd8d5fb8 100644 --- a/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/ebook_holds.tt2 @@ -23,7 +23,7 @@ [% IF ctx.my_hold_subscriptions.size > 0 %]
- [% l("Hold Subscriptions") %] + [% l("Hold Groups") %]
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 b/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 index c5b1f11bd8..d1ce4961d7 100644 --- a/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 +++ b/Open-ILS/src/templates/opac/myopac/ebook_holds_ready.tt2 @@ -23,7 +23,7 @@
[% IF ctx.my_hold_subscriptions.size > 0 %]
- [% l("Hold Subscriptions") %] + [% l("Hold Groups") %]
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 index bbd0b20f27..c5da38e819 100644 --- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2 @@ -25,7 +25,7 @@ [% END %] [% IF ctx.my_hold_subscriptions.size > 0 %]
- [% l("Hold Subscriptions") %] + [% l("Hold Groups") %]
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/hold_subscriptions.tt2 b/Open-ILS/src/templates/opac/myopac/hold_subscriptions.tt2 index 79fa632d0c..51fa081634 100644 --- a/Open-ILS/src/templates/opac/myopac/hold_subscriptions.tt2 +++ b/Open-ILS/src/templates/opac/myopac/hold_subscriptions.tt2 @@ -25,7 +25,7 @@ [% END %] [% IF ctx.my_hold_subscriptions.size > 0 %]
- [% l("Hold Subscriptions") %] + [% l("Hold Groups") %]
[% END %]
@@ -34,7 +34,7 @@
- [% l("Current Hold Subscriptions") %] + [% l("Current Hold Groups") %] [% l('Export List') %] @@ -47,7 +47,7 @@ [% l('No subscriptions found.') %]
[% ELSE %] - +
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2 index 5c2630fd1d..60acf7dde4 100644 --- a/Open-ILS/src/templates/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/holds.tt2 @@ -26,7 +26,7 @@ [% END %] [% IF ctx.my_hold_subscriptions.size > 0 %]
- [% l("Hold Subscriptions") %] + [% l("Hold Groups") %]
[% END %]
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2 index 5d811ed5cb..809def348c 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2 @@ -137,10 +137,10 @@ function maybeToggleNumCopies(obj) { name="hold_usr_is_requestor" value="2" />
[% l('Name') %]