- Evergreen-commits - example.com

[GIT] Evergreen ILS branch main updated. 5b796601dad9bc8f7b5ab7de141a147a5bf59a40
by Git User 18 Mar '25

18 Mar '25

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 5b796601dad9bc8f7b5ab7de141a147a5bf59a40 (commit) via 5b90c95f19b83bebc266ab44918ccc62bb9ae5ef (commit) from 7e70a43c3a65fdc783c0f7045427ab8fbf2ee91d (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 5b796601dad9bc8f7b5ab7de141a147a5bf59a40 Author: Jason Boyer <JBoyer(a)equinoxOLI.org> Date: Tue Mar 18 16:12:28 2025 -0400 LP2086106: Stamping Upgrade Script Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 3eb6bf8f11..f2428586a1 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 ('1460', :eg_version); -- JBoyer/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1461', :eg_version); -- berick/llewellyn.masrshall/JBoyer CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.phone-settings-index.sql b/Open-ILS/src/sql/Pg/upgrade/1461.schema.phone-settings-index.sql similarity index 87% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.phone-settings-index.sql rename to Open-ILS/src/sql/Pg/upgrade/1461.schema.phone-settings-index.sql index 426bcded49..4cf6ce9a87 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.phone-settings-index.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1461.schema.phone-settings-index.sql @@ -1,6 +1,6 @@ BEGIN; --- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1461', :eg_version); -- for searching e.g. "111-111-1111" CREATE INDEX actor_usr_setting_phone_values_idx commit 5b90c95f19b83bebc266ab44918ccc62bb9ae5ef Author: Bill Erickson <berickxx(a)gmail.com> Date: Thu Oct 31 10:27:05 2024 -0400 LP2086106 SMS/Default phone search performance improvements Move the patron phone search part of the query to a CTE/WITH clause and add an index on phone-related user settings to improve performance. Now the query looks more like this: WITH has_phone_number AS ( SELECT id FROM actor.usr WHERE evergreen.lowercase(day_phone) ~ '^333-333-3333' OR evergreen.lowercase(evening_phone) ~ '^333-333-3333' OR evergreen.lowercase(other_phone) ~ '^333-333-3333' UNION SELECT usr AS id FROM actor.usr_setting WHERE name IN ('opac.default_phone', 'opac.default_sms_notify') AND evergreen.lowercase(value) ~ '^"?333-333-3333' ) SELECT ... FROM actor.usr AS users JOIN actor.org_unit_descendants(1) d ON (d.id = users.home_ou) JOIN has_phone_number hpn ON hpn.id = users.id WHERE users.deleted = FALSE AND users.active = TRUE ... Signed-off-by: Bill Erickson <berickxx(a)gmail.com> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm index e40fe94d10..3ef2d8478a 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm @@ -789,11 +789,16 @@ sub patron_search { unshift(@usrv, $cv); } - my $phone = ''; - my @ps; + my $phone_cte = ''; + my $phone_join = ''; my @phonev; + if ($pv) { - for my $p ( qw/day_phone evening_phone other_phone/ ) { + $phone_join = 'JOIN has_phone_number hpn ON hpn.id = users.id'; + + my @ps; + + for my $p (qw/day_phone evening_phone other_phone/) { if ($pv =~ /^\d+$/) { push @ps, "evergreen.lowercase(REGEXP_REPLACE($p, '[^0-9]', '', 'g')) ~ ?"; } else { @@ -802,26 +807,27 @@ sub patron_search { push @phonev, "^$pv"; } - # Also search user settings which may contain phone number values. + my $main_where = join(' OR ', @ps); + + my $main_query = "SELECT id FROM actor.usr WHERE $main_where"; + my $normalize = ($pv =~ /^\d+$/) ? "evergreen.lowercase(REGEXP_REPLACE(value, '[^0-9]', '', 'g')) ~ ?" : "evergreen.lowercase(value) ~ ?"; - push @ps, <<" SQL"; - EXISTS ( - SELECT TRUE FROM actor.usr_setting - WHERE usr = u.id - AND name IN ('opac.default_phone', 'opac.default_sms_notify') - AND $normalize - LIMIT 1 - ) + my $setting_query = <<" SQL"; + SELECT usr AS id + FROM actor.usr_setting + WHERE + name IN ('opac.default_phone', 'opac.default_sms_notify') + AND $normalize SQL # Prefix the search value with '"?' since user setting phone # values may be stored as JSON numbers or (more likely) strings. push(@phonev, "^\"?$pv"); - $phone = '(' . join(' OR ', @ps) . ')'; + $phone_cte = "WITH has_phone_number AS ($main_query UNION $setting_query)" } my $ident = ''; @@ -860,7 +866,7 @@ sub patron_search { $profile = '(profile IN (SELECT id FROM permission.grp_descendants(?)))'; push @profv, $prof; } - my $usr_where = join ' AND ', grep { $_ } ($usr,$phone,$ident,$name,$profile); + my $usr_where = join ' AND ', grep { $_ } ($usr,$ident,$name,$profile); my $addr_where = $addr; @@ -889,7 +895,7 @@ sub patron_search { $select = "$a_select"; } - return undef if (!$select && !$card); + return undef if (!$select && !$card && !$phone_cte); my $order_by = join ', ', map { 'evergreen.lowercase(CAST(users.'. (split / /,$_)[0] . ' AS text)) ' . (split / /,$_)[1] } @$sort; my $distinct_list = join ', ', map { 'evergreen.lowercase(CAST(users.'. (split / /,$_)[0] . ' AS text))' } @$sort; @@ -930,9 +936,11 @@ sub patron_search { $select = "JOIN ($select) AS search ON (search.id = users.id)" if ($select); $select = <<" SQL"; + $phone_cte SELECT $distinct_list FROM $u_table AS users $card JOIN $descendants d ON (d.id = users.home_ou) + $phone_join $select $clone_select $penalty_join @@ -945,7 +953,7 @@ sub patron_search { OFFSET $offset SQL - return actor::user->db_Main->selectcol_arrayref($select, {Columns=>[scalar(@$sort)]}, map {lc($_)} (@usrv,@phonev,@identv,@namev,@profv,@addrv)); + return actor::user->db_Main->selectcol_arrayref($select, {Columns=>[scalar(@$sort)]}, map {lc($_)} (@phonev,@usrv,@identv,@namev,@profv,@addrv)); } __PACKAGE__->register_method( api_name => 'open-ils.storage.actor.user.crazy_search', diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql index 98ea60b9bc..5ddf319ccc 100644 --- a/Open-ILS/src/sql/Pg/005.schema.actors.sql +++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql @@ -208,6 +208,15 @@ $$; CREATE INDEX actor_usr_setting_usr_idx ON actor.usr_setting (usr); +-- special indexes for phone number searches +CREATE INDEX actor_usr_setting_phone_values_idx + ON actor.usr_setting (evergreen.lowercase(value)) + WHERE name IN ('opac.default_phone', 'opac.default_sms_notify'); + +CREATE INDEX actor_usr_setting_phone_values_numeric_idx + ON actor.usr_setting (evergreen.lowercase(REGEXP_REPLACE(value, '[^0-9]', '', 'g'))) + WHERE name IN ('opac.default_phone', 'opac.default_sms_notify'); + CREATE TABLE actor.stat_cat_sip_fields ( field CHAR(2) PRIMARY KEY, name TEXT NOT NULL, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.phone-settings-index.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.phone-settings-index.sql new file mode 100644 index 0000000000..426bcded49 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.phone-settings-index.sql @@ -0,0 +1,15 @@ +BEGIN; + +-- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version); + +-- for searching e.g. "111-111-1111" +CREATE INDEX actor_usr_setting_phone_values_idx + ON actor.usr_setting (evergreen.lowercase(value)) + WHERE name IN ('opac.default_phone', 'opac.default_sms_notify'); + +-- for searching e.g. "1111111111" +CREATE INDEX actor_usr_setting_phone_values_numeric_idx + ON actor.usr_setting (evergreen.lowercase(REGEXP_REPLACE(value, '[^0-9]', '', 'g'))) + WHERE name IN ('opac.default_phone', 'opac.default_sms_notify'); + +COMMIT; ----------------------------------------------------------------------- Summary of changes: .../OpenILS/Application/Storage/Publisher/actor.pm | 40 +++++++++++++--------- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/005.schema.actors.sql | 9 +++++ .../upgrade/1461.schema.phone-settings-index.sql | 15 ++++++++ 4 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1461.schema.phone-settings-index.sql hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 0ebe1ced8cd97a38372004b511df96645d908ed3
by Git User 18 Mar '25

18 Mar '25

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_14 has been updated via 0ebe1ced8cd97a38372004b511df96645d908ed3 (commit) from 4b5aee80b8712e23aafac7d5dbdc5c4f183fa765 (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 0ebe1ced8cd97a38372004b511df96645d908ed3 Author: Josh Stompro <stomproj(a)larl.org> Date: Wed Jul 24 14:08:57 2024 -0500 LP#2073896 - Angular Catalog Place Holds Ignore Empty User Setting When placing a hold in the Angular Staff Catalog, the Phone Number for Notify by Phone was correctly grabbing the Day Phone as a default value, but was then having a blank user setting for 'opac.default_phone' = '""' clear out that value, preventing the day phone from being used. Blank user settings sometimes get set to '""' when unset. The code that handles populating the hold notification preferences was looking for null or '' values, but wasn't looking for '""'. Release-note: Fixes blank user setting handling in Angular staff catalog place holds. Testing Notes: Before fix is applied. Setup: 1. Choose a patron to test with. 2. Enter a Daytime Phone number if it doesn't exists. 3. Enter a Default Phone Number 4. Uncheck the notice preferences just for simplicity so saving the record is easier. 5. Save the Record. 6. Remove the Default Phone Number and save again. This ensures the user setting exists as a blank value. Test: 1. Find a title in the angular staff catalog and place a hold. 2. Enter the patron's barcode. 3. Note that nothing shows up in the phone number field. After Fix: 1. Use the same setup as above. 2. Find a title in the angular staff catalog and place a hold. 3. Enter the patron's barcode. 4. Note that now the daytime phone number shows up in the phone field. 5. Check the Notify by phone box, and place the hold using the daytime phone number as the phone notify number. Signed-off-by: Josh Stompro <stomproj(a)larl.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts index a18d178a21..6c6c67d649 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts @@ -490,7 +490,7 @@ export class HoldComponent implements OnInit { const name = setting.name(); let value = setting.value(); - if (value === '' || value === null) { return; } + if (value === '' || value === null || value === '""') { return; } // When fleshing 'settings' on the actor.usr object, // we're grabbing the raw JSON values. ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 44c3dc0482fdf4d103d798ac9f2e7b8bd2342adb
by Git User 18 Mar '25

18 Mar '25

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_13 has been updated via 44c3dc0482fdf4d103d798ac9f2e7b8bd2342adb (commit) from 7788751a819d94850524977512389381d0df57b3 (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 44c3dc0482fdf4d103d798ac9f2e7b8bd2342adb Author: Josh Stompro <stomproj(a)larl.org> Date: Wed Jul 24 14:08:57 2024 -0500 LP#2073896 - Angular Catalog Place Holds Ignore Empty User Setting When placing a hold in the Angular Staff Catalog, the Phone Number for Notify by Phone was correctly grabbing the Day Phone as a default value, but was then having a blank user setting for 'opac.default_phone' = '""' clear out that value, preventing the day phone from being used. Blank user settings sometimes get set to '""' when unset. The code that handles populating the hold notification preferences was looking for null or '' values, but wasn't looking for '""'. Release-note: Fixes blank user setting handling in Angular staff catalog place holds. Testing Notes: Before fix is applied. Setup: 1. Choose a patron to test with. 2. Enter a Daytime Phone number if it doesn't exists. 3. Enter a Default Phone Number 4. Uncheck the notice preferences just for simplicity so saving the record is easier. 5. Save the Record. 6. Remove the Default Phone Number and save again. This ensures the user setting exists as a blank value. Test: 1. Find a title in the angular staff catalog and place a hold. 2. Enter the patron's barcode. 3. Note that nothing shows up in the phone number field. After Fix: 1. Use the same setup as above. 2. Find a title in the angular staff catalog and place a hold. 3. Enter the patron's barcode. 4. Note that now the daytime phone number shows up in the phone field. 5. Check the Notify by phone box, and place the hold using the daytime phone number as the phone notify number. Signed-off-by: Josh Stompro <stomproj(a)larl.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts index 21c203d7bc..ffc95004ee 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts @@ -483,7 +483,7 @@ export class HoldComponent implements OnInit { const name = setting.name(); let value = setting.value(); - if (value === '' || value === null) { return; } + if (value === '' || value === null || value === '""') { return; } // When fleshing 'settings' on the actor.usr object, // we're grabbing the raw JSON values. ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 7e70a43c3a65fdc783c0f7045427ab8fbf2ee91d
by Git User 18 Mar '25

18 Mar '25

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 7e70a43c3a65fdc783c0f7045427ab8fbf2ee91d (commit) from 04edf032309e454d191183a49f7b9f1502be6de0 (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 7e70a43c3a65fdc783c0f7045427ab8fbf2ee91d Author: Josh Stompro <stomproj(a)larl.org> Date: Wed Jul 24 14:08:57 2024 -0500 LP#2073896 - Angular Catalog Place Holds Ignore Empty User Setting When placing a hold in the Angular Staff Catalog, the Phone Number for Notify by Phone was correctly grabbing the Day Phone as a default value, but was then having a blank user setting for 'opac.default_phone' = '""' clear out that value, preventing the day phone from being used. Blank user settings sometimes get set to '""' when unset. The code that handles populating the hold notification preferences was looking for null or '' values, but wasn't looking for '""'. Release-note: Fixes blank user setting handling in Angular staff catalog place holds. Testing Notes: Before fix is applied. Setup: 1. Choose a patron to test with. 2. Enter a Daytime Phone number if it doesn't exists. 3. Enter a Default Phone Number 4. Uncheck the notice preferences just for simplicity so saving the record is easier. 5. Save the Record. 6. Remove the Default Phone Number and save again. This ensures the user setting exists as a blank value. Test: 1. Find a title in the angular staff catalog and place a hold. 2. Enter the patron's barcode. 3. Note that nothing shows up in the phone number field. After Fix: 1. Use the same setup as above. 2. Find a title in the angular staff catalog and place a hold. 3. Enter the patron's barcode. 4. Note that now the daytime phone number shows up in the phone field. 5. Check the Notify by phone box, and place the hold using the daytime phone number as the phone notify number. Signed-off-by: Josh Stompro <stomproj(a)larl.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts index ce7acc5ccd..d3728c3b2c 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts @@ -506,7 +506,7 @@ export class HoldComponent implements OnInit, OnDestroy { const name = setting.name(); let value = setting.value(); - if (value === '' || value === null) { return; } + if (value === '' || value === null || value === '""') { return; } // When fleshing 'settings' on the actor.usr object, // we're grabbing the raw JSON values. ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 04edf032309e454d191183a49f7b9f1502be6de0
by Git User 17 Mar '25

17 Mar '25

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 04edf032309e454d191183a49f7b9f1502be6de0 (commit) via deb02bb9d813c4c220712a8ffd1ab5c6867c7197 (commit) via 667c5b89d7e9001b3c4c9a14319416c9df021acc (commit) via f05a370e05fbf8209a0d4ed5b967bb890d70777c (commit) via 8ee457a4a04b8cf5557d8587075014ea11b71e1c (commit) from 7ddcbb35f0f373ad161282b40252e68f6b1ed046 (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 04edf032309e454d191183a49f7b9f1502be6de0 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Mon Mar 17 19:41:30 2025 -0700 LP2084181: stamp upgrade script Signed-off-by: Jane Sandberg <sandbergja(a)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 121d2e257b..3eb6bf8f11 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 ('1459', :eg_version); -- terranm/blake +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1460', :eg_version); -- JBoyer/sandbergja CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staff_client_clear_long_caches.sql b/Open-ILS/src/sql/Pg/upgrade/1460.data.staff_client_clear_long_caches.sql similarity index 88% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.staff_client_clear_long_caches.sql rename to Open-ILS/src/sql/Pg/upgrade/1460.data.staff_client_clear_long_caches.sql index dbbadadc08..28e5d37a0c 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staff_client_clear_long_caches.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1460.data.staff_client_clear_long_caches.sql @@ -1,6 +1,6 @@ BEGIN; ---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); -- JBoyer +SELECT evergreen.upgrade_deps_block_check('1460', :eg_version); -- JBoyer -- Note: the value will not be consistent from system to system. It's an opaque key that has no meaning of its own, -- if the value cached in the client does not match or is missing, it clears some cached values and then saves the current value. commit deb02bb9d813c4c220712a8ffd1ab5c6867c7197 Author: Jane Sandberg <sandbergja(a)gmail.com> Date: Mon Mar 17 19:38:40 2025 -0700 LP2084181: two small follow-ups * toPromise() is deprecated, this commit instead uses lastValueFrom so there is one less thing to clean up. * remove a redundant Promise.resolve() Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/core/auth.service.ts b/Open-ILS/src/eg2/src/app/core/auth.service.ts index 1f5ba13151..787afcee44 100644 --- a/Open-ILS/src/eg2/src/app/core/auth.service.ts +++ b/Open-ILS/src/eg2/src/app/core/auth.service.ts @@ -4,6 +4,7 @@ import {NetService} from './net.service'; import {EventService, EgEvent} from './event.service'; import {IdlService, IdlObject} from './idl.service'; import {StoreService} from './store.service'; +import { lastValueFrom } from 'rxjs'; // Not universally available. declare var BroadcastChannel; // eslint-disable-line no-var @@ -255,10 +256,10 @@ export class AuthService { } - return this.net.request( + return lastValueFrom(this.net.request( 'open-ils.actor', 'open-ils.actor.staff_client_cache_key' - ).toPromise().then(cacheKey => { + )).then(cacheKey => { console.debug('Cache key: ' + cacheKey); const currentKey = this.store.getLocalItem('eg.staff_client_cache_key'); @@ -280,8 +281,6 @@ export class AuthService { this.store.removeLocalItems(clearItems); this.store.setLocalItem('eg.staff_client_cache_key', cacheKey); } - - return Promise.resolve(); }); } commit 667c5b89d7e9001b3c4c9a14319416c9df021acc Author: Jason Boyer <> Date: Tue Nov 19 16:23:04 2024 -0500 LP2084181: Add Release Note Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/docs/RELEASE_NOTES_NEXT/Administration/staff_client_cache_clear.adoc b/docs/RELEASE_NOTES_NEXT/Administration/staff_client_cache_clear.adoc new file mode 100644 index 0000000000..78be623e51 --- /dev/null +++ b/docs/RELEASE_NOTES_NEXT/Administration/staff_client_cache_clear.adoc @@ -0,0 +1,9 @@ +== Global Long-Lived Cache Clearing for Staff Client == + +A new global flag (staff.client_cache_key) has been added that allows +administrators to clear certain long-lived cache values from all staff clients +at next login by simply changing the value. Currently only the MARC Tag Tables +used by the bibliographic and authority record editors are cleared, but the +list of localStorage items cleared may be expanded in future. This key is +simply an opaque string - no special format is required - changing the value in +any way will trigger a wave of cache clearing. commit f05a370e05fbf8209a0d4ed5b967bb890d70777c Author: Jason Boyer <> Date: Mon Nov 18 15:23:48 2024 -0500 LP2084181: Long-Lived-Cache Clearing for Staff Client Add a global flag and method to retrieve it for the staff client. If this value hasn't been set before or doesn't match the value in localStorage, clear some long-lived cache values from the staff client. Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/core/auth.service.ts b/Open-ILS/src/eg2/src/app/core/auth.service.ts index fc4100d666..1f5ba13151 100644 --- a/Open-ILS/src/eg2/src/app/core/auth.service.ts +++ b/Open-ILS/src/eg2/src/app/core/auth.service.ts @@ -254,7 +254,36 @@ export class AuthService { this.store.setLoginSessionItem(`${this.authDomain}.time`, this.authtime()); } - return Promise.resolve(); + + return this.net.request( + 'open-ils.actor', + 'open-ils.actor.staff_client_cache_key' + ).toPromise().then(cacheKey => { + console.debug('Cache key: ' + cacheKey); + + const currentKey = this.store.getLocalItem('eg.staff_client_cache_key'); + + if ( currentKey !== cacheKey ) { + const allItems = this.store.getLocalItemNames(); + const clearItems = []; + + allItems.forEach(aryItem => { + // MARC Tag Tables take a long time to load + if (aryItem.match(/^ff/i)) { clearItems.push(aryItem); } + if (aryItem.match('^current_tag_table')) { clearItems.push(aryItem); } + // Additional RE matches against aryItem can be added here + }); + // Additional static keys can be added here + // clearItems.push('eg.some.key.whatevs'); + + console.debug('Cache key changed, clearing localStorage items: ' + clearItems.join(', ')); + this.store.removeLocalItems(clearItems); + this.store.setLocalItem('eg.staff_client_cache_key', cacheKey); + } + + return Promise.resolve(); + }); + } undoOpChange(): Promise<any> { diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm index 027b9025d4..6d724695dc 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm @@ -5403,4 +5403,31 @@ sub filter_group_entry_crud { } } +__PACKAGE__->register_method( + method => "get_staff_client_cache_key", + api_name => "open-ils.actor.staff_client_cache_key", + signature => { + desc => q/ + Return a key that the staff client can use to + determine whether it should purge long-cached objects + /, + return => { + desc => "An opaque cache key", + type => "string" + } + } +); + +sub get_staff_client_cache_key { + my $self = shift; + + my $value = $U->get_global_flag('staff.client_cache_key'); + + $value = $value->value() if $value; + # Undef is an unfriendly "not found" + $value = "BleepBloopNoKey" unless $value; + + return $value; +} + 1; 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 52ed1f9a44..411ebbdaf3 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -12862,6 +12862,19 @@ INSERT INTO config.global_flag (name, label, value, enabled) VALUES ( TRUE ); +INSERT INTO config.global_flag (name, label, value, enabled) VALUES ( + 'staff.client_cache_key', + oils_i18n_gettext( + 'staff.client_cache_key', + 'Change this value to force staff clients to clear some cached values', + 'cgf', + 'label' + ), + md5(random()::text), + TRUE +); + + INSERT INTO config.usr_setting_type (name,opac_visible,label,description,datatype) VALUES ( 'history.circ.retention_age', diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staff_client_clear_long_caches.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staff_client_clear_long_caches.sql new file mode 100644 index 0000000000..dbbadadc08 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.staff_client_clear_long_caches.sql @@ -0,0 +1,19 @@ +BEGIN; + +--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); -- JBoyer + +-- Note: the value will not be consistent from system to system. It's an opaque key that has no meaning of its own, +-- if the value cached in the client does not match or is missing, it clears some cached values and then saves the current value. +INSERT INTO config.global_flag (name, label, value, enabled) VALUES ( + 'staff.client_cache_key', + oils_i18n_gettext( + 'staff.client_cache_key', + 'Change this value to force staff clients to clear some cached values', + 'cgf', + 'label' + ), + md5(random()::text), + TRUE +); + +COMMIT; commit 8ee457a4a04b8cf5557d8587075014ea11b71e1c Author: Jason Boyer <> Date: Tue Nov 12 19:37:46 2024 +0000 LP2084181: Add StoreService calls for multiple items Add some convenience calls that take array parameters to the StoreService for localStorage items. Signed-off-by: Jason Boyer <JBoyer(a)equinoxOLI.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/core/store.service.ts b/Open-ILS/src/eg2/src/app/core/store.service.ts index d55cdc0603..e18ececc1c 100644 --- a/Open-ILS/src/eg2/src/app/core/store.service.ts +++ b/Open-ILS/src/eg2/src/app/core/store.service.ts @@ -113,6 +113,14 @@ export class StoreService { return this.parseJson(window.localStorage.getItem(key)); } + getLocalItemNames(): string[] { + const keys = []; + for (let i = 0; i < window.localStorage.length ; i++ ) { + keys.push(window.localStorage.key(i)); + } + return keys; + } + getSessionItem(key: string): any { return this.parseJson(window.sessionStorage.getItem(key)); } @@ -198,6 +206,10 @@ export class StoreService { window.localStorage.removeItem(key); } + removeLocalItems(keys: string[]): void { + keys.forEach((key) => this.removeLocalItem(key)); + } + removeSessionItem(key: string): void { window.sessionStorage.removeItem(key); } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/core/auth.service.ts | 30 +++++++++++++++++++++- Open-ILS/src/eg2/src/app/core/store.service.ts | 12 +++++++++ .../src/perlmods/lib/OpenILS/Application/Actor.pm | 27 +++++++++++++++++++ Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 13 ++++++++++ .../1460.data.staff_client_clear_long_caches.sql | 19 ++++++++++++++ .../Administration/staff_client_cache_clear.adoc | 9 +++++++ 7 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1460.data.staff_client_clear_long_caches.sql create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/staff_client_cache_clear.adoc hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 4b5aee80b8712e23aafac7d5dbdc5c4f183fa765
by Git User 17 Mar '25

17 Mar '25

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_14 has been updated via 4b5aee80b8712e23aafac7d5dbdc5c4f183fa765 (commit) from 772495aadb8122771ca80420681604aa8409bc93 (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 4b5aee80b8712e23aafac7d5dbdc5c4f183fa765 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Wed Feb 5 13:39:21 2025 -0500 LP2090958 Can't select charges for credit card payment The OPAC accessibility omnibus included some changes that broke the functionality and layout of the My Account > Charges page. This partially reverts the changes to the charges.tt2 page in order to restore functionality and layout until the page can be reviewed again for accessibility needs. Release-note: Restores the ability to select charges for payment in the OPAC. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index 7d3b06b4d3..612d4649f5 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -72,14 +72,14 @@ END %] <tr role="row" id='myopac_circ_trans_row'> [% IF myopac_cc_allowed %] - <th class="checkCell form-check"> + <td class="checkCell"> <input type="checkbox" checked="checked" - [% html_text_attr('aria-label', l('Pay [_1] fine', money(f.xact.balance_owed))) %] - name="xact" value="[% f.xact.id %]" class="form-check-input fineCheck"/> - </th> + [% html_text_attr('aria-label', l('Pay [_1] fine', money(f.xact.balance_owed))) %] + name="xact" value="[% f.xact.id %]" class="fineCheck"/> + </td> [% END %] - <td role="cell" class="numeric money fw-bold" mobile-title='[% l("Owed") %]'> + <td role="cell" class="numeric money fw-bold danger" mobile-title='[% l("Owed") %]'> [% money(f.xact.balance_owed) %] <input class="fineAmount" value="[% f.xact.balance_owed %]" hidden /> </td> @@ -151,7 +151,7 @@ [% IF myopac_cc_allowed %] <div class="d-block d-md-none form-check"> - <input id="pay_fines_check" checked="checked" class="form-check-input" + <input id="pay_fines_check" checked="checked" class="form-check-input" type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)" aria-label="[% l('Check/Uncheck All') %]" /> <label for="pay_fines_check" class="form-check-label">[% l('Check/Uncheck All') %]</label> @@ -165,7 +165,7 @@ [% IF myopac_cc_allowed %] <th style="white-space:nowrap;"> - <input id="pay_fines_box2" checked="checked" class="form-check-input" + <input id="pay_fines_box2" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)" aria-label="[% l('Check/Uncheck All') %]" /> </th> @@ -180,28 +180,29 @@ </thead> <tbody id='myopac_trans_tbody'> [% FOR f IN ctx.fines.grocery %] - <tr role="row" class ='myopac_trans_row'> + <tr role="row" class='myopac_trans_row'> [% c = c + 1; %] [% IF myopac_cc_allowed %] - <th role="rowheader" scope="row" class="checkCell form-check"> + <td class="checkCell"> <label class="sr-only">[% l('Billing Number [_1]', c) %]</label> - <input aria-label="[% l('Pay [_0] bill', money(f.xact.balance_owed)) %]" class="form-check-input fineCheck" type="checkbox" name="xact_misc" value="[% f.xact.id %]" checked="checked" /> - </th> + <input aria-label="[% l('Pay [_0] bill', money(f.xact.balance_owed)) %]" class="fineCheck" + type="checkbox" name="xact_misc" value="[% f.xact.id %]" checked="checked" /> + </td> [% END %] <td role="cell" class="danger"> - <strong> - [% money(f.xact.balance_owed) %] - </strong> - <input type="hidden" class="fineAmount" value="[% f.xact.balance_owed %]" hidden /> + [% money(f.xact.balance_owed) %] + <input type="hidden" class="fineAmount" value="[% f.xact.balance_owed %]" hidden /> </td> <td role="cell"> + <span class="sr-only">[% l('Billing For') %]</span> [% f.xact.last_billing_type %] </td> <td role="cell"> [% IF f.xact.last_billing_note; %] + <span class="sr-only">[% l('Note') %]</span> [% f.xact.last_billing_note %] [% END %] </td> @@ -221,7 +222,7 @@ <div>[% l('You have no current fines.') %]</div> [% ELSIF myopac_cc_allowed %] <div class="my-3"> - <button type="button" value="[% l('Pay selected charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]" title="[% l('Pay selected charges') %]" class="btn btn-confirm my-1" + <button type="submit" value="[% l('Pay selected charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]" title="[% l('Pay selected charges') %]" class="btn btn-confirm my-1" id="selectPay"> <i class='fas fa-money-bill-wave' aria-hidden="true"></i> [% l('Pay Selected Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button> <button type="submit" class="btn btn-confirm my-1"><i class="fas fa-cash-register" aria-hidden="true"></i> [% l('Pay All Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button> </div> ----------------------------------------------------------------------- Summary of changes: .../templates-bootstrap/opac/myopac/charges.tt2 | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 7ddcbb35f0f373ad161282b40252e68f6b1ed046
by Git User 17 Mar '25

17 Mar '25

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 7ddcbb35f0f373ad161282b40252e68f6b1ed046 (commit) from 34ea53321cbcc50dff3cdce0c0767a6f923d667b (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 7ddcbb35f0f373ad161282b40252e68f6b1ed046 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Wed Feb 5 13:39:21 2025 -0500 LP2090958 Can't select charges for credit card payment The OPAC accessibility omnibus included some changes that broke the functionality and layout of the My Account > Charges page. This partially reverts the changes to the charges.tt2 page in order to restore functionality and layout until the page can be reviewed again for accessibility needs. Release-note: Restores the ability to select charges for payment in the OPAC. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index 7d3b06b4d3..612d4649f5 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -72,14 +72,14 @@ END %] <tr role="row" id='myopac_circ_trans_row'> [% IF myopac_cc_allowed %] - <th class="checkCell form-check"> + <td class="checkCell"> <input type="checkbox" checked="checked" - [% html_text_attr('aria-label', l('Pay [_1] fine', money(f.xact.balance_owed))) %] - name="xact" value="[% f.xact.id %]" class="form-check-input fineCheck"/> - </th> + [% html_text_attr('aria-label', l('Pay [_1] fine', money(f.xact.balance_owed))) %] + name="xact" value="[% f.xact.id %]" class="fineCheck"/> + </td> [% END %] - <td role="cell" class="numeric money fw-bold" mobile-title='[% l("Owed") %]'> + <td role="cell" class="numeric money fw-bold danger" mobile-title='[% l("Owed") %]'> [% money(f.xact.balance_owed) %] <input class="fineAmount" value="[% f.xact.balance_owed %]" hidden /> </td> @@ -151,7 +151,7 @@ [% IF myopac_cc_allowed %] <div class="d-block d-md-none form-check"> - <input id="pay_fines_check" checked="checked" class="form-check-input" + <input id="pay_fines_check" checked="checked" class="form-check-input" type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)" aria-label="[% l('Check/Uncheck All') %]" /> <label for="pay_fines_check" class="form-check-label">[% l('Check/Uncheck All') %]</label> @@ -165,7 +165,7 @@ [% IF myopac_cc_allowed %] <th style="white-space:nowrap;"> - <input id="pay_fines_box2" checked="checked" class="form-check-input" + <input id="pay_fines_box2" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)" aria-label="[% l('Check/Uncheck All') %]" /> </th> @@ -180,28 +180,29 @@ </thead> <tbody id='myopac_trans_tbody'> [% FOR f IN ctx.fines.grocery %] - <tr role="row" class ='myopac_trans_row'> + <tr role="row" class='myopac_trans_row'> [% c = c + 1; %] [% IF myopac_cc_allowed %] - <th role="rowheader" scope="row" class="checkCell form-check"> + <td class="checkCell"> <label class="sr-only">[% l('Billing Number [_1]', c) %]</label> - <input aria-label="[% l('Pay [_0] bill', money(f.xact.balance_owed)) %]" class="form-check-input fineCheck" type="checkbox" name="xact_misc" value="[% f.xact.id %]" checked="checked" /> - </th> + <input aria-label="[% l('Pay [_0] bill', money(f.xact.balance_owed)) %]" class="fineCheck" + type="checkbox" name="xact_misc" value="[% f.xact.id %]" checked="checked" /> + </td> [% END %] <td role="cell" class="danger"> - <strong> - [% money(f.xact.balance_owed) %] - </strong> - <input type="hidden" class="fineAmount" value="[% f.xact.balance_owed %]" hidden /> + [% money(f.xact.balance_owed) %] + <input type="hidden" class="fineAmount" value="[% f.xact.balance_owed %]" hidden /> </td> <td role="cell"> + <span class="sr-only">[% l('Billing For') %]</span> [% f.xact.last_billing_type %] </td> <td role="cell"> [% IF f.xact.last_billing_note; %] + <span class="sr-only">[% l('Note') %]</span> [% f.xact.last_billing_note %] [% END %] </td> @@ -221,7 +222,7 @@ <div>[% l('You have no current fines.') %]</div> [% ELSIF myopac_cc_allowed %] <div class="my-3"> - <button type="button" value="[% l('Pay selected charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]" title="[% l('Pay selected charges') %]" class="btn btn-confirm my-1" + <button type="submit" value="[% l('Pay selected charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]" title="[% l('Pay selected charges') %]" class="btn btn-confirm my-1" id="selectPay"> <i class='fas fa-money-bill-wave' aria-hidden="true"></i> [% l('Pay Selected Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button> <button type="submit" class="btn btn-confirm my-1"><i class="fas fa-cash-register" aria-hidden="true"></i> [% l('Pay All Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button> </div> ----------------------------------------------------------------------- Summary of changes: .../templates-bootstrap/opac/myopac/charges.tt2 | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 34ea53321cbcc50dff3cdce0c0767a6f923d667b
by Git User 10 Mar '25

10 Mar '25

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 34ea53321cbcc50dff3cdce0c0767a6f923d667b (commit) via dd4ea72e78747fd8c231aa5eca71212114a66fe5 (commit) from a59c0fab59e06355a4f0f937588b0b928c17d5ba (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 34ea53321cbcc50dff3cdce0c0767a6f923d667b Author: blake <blake(a)mobiusconsortium.org> Date: Mon Mar 10 16:18:10 2025 -0500 Stamping upgrade 1459 Signed-off-by: blake <blake(a)mobiusconsortium.org> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 3c5363363d..121d2e257b 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 ('1458', :eg_version); -- terranm/blake +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1459', :eg_version); -- terranm/blake CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql b/Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql similarity index 93% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql rename to Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql index 77c23c1b81..6d0bff0cdb 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql @@ -2,7 +2,7 @@ BEGIN; -- Move Google Analytics settings from config.tt2 to library settings --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1459', :eg_version); INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) commit dd4ea72e78747fd8c231aa5eca71212114a66fe5 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Thu Jan 16 12:23:09 2025 -0500 LP1906699 Move Google Analytics Config to Library Settings Moves the Google Analytics configuration from the config.tt2 file in the Bootstrap OPAC to two new library settings. . Google Analytics: Enable (true/false) . Google Analytics: Code (Analytics account code) Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Shula Link <devonkonti(a)gmail.com> Signed-off-by: blake <blake(a)mobiusconsortium.org> 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 f9fa215fa7..52ed1f9a44 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -24940,3 +24940,28 @@ VALUES ( 'coust', 'description'), 'string' ); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.google_analytics_enable', + 'opac', + oils_i18n_gettext('opac.google_analytics_enable', + 'Google Analytics: Enable', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_show', + 'Enable Google Analytics in the OPAC. Default is false.', + 'coust', 'description'), + 'bool' +), ( + 'opac.google_analytics_code', + 'opac', + oils_i18n_gettext('opac.google_analytics_code', + 'Google Analytics: Code', + 'coust', 'label'), + oils_i18n_gettext('opac.google_analytics_code', + 'Account code provided by Google. (Example: G-GVGQ11X12)', + 'coust', 'description'), + 'string' +); + diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql new file mode 100644 index 0000000000..77c23c1b81 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_google_analytics.sql @@ -0,0 +1,35 @@ +BEGIN; + +-- Move Google Analytics settings from config.tt2 to library settings + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.google_analytics_enable', + 'opac', + oils_i18n_gettext('opac.google_analytics_enable', + 'Google Analytics: Enable', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_show', + 'Enable Google Analytics in the OPAC. Default is false.', + 'coust', 'description'), + 'bool' +); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.google_analytics_code', + 'opac', + oils_i18n_gettext('opac.google_analytics_code', + 'Google Analytics: Code', + 'coust', 'label'), + oils_i18n_gettext('opac.google_analytics_code', + 'Account code provided by Google. (Example: G-GVGQ11X12)', + 'coust', 'description'), + 'string' +); + +COMMIT; \ No newline at end of file diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 index 29370bca34..ab3278a7d9 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 @@ -42,15 +42,6 @@ ctx.refworks.url = 'http://www.refworks.com'; openurl.enabled = 'false'; openurl.baseurl = 'http://sfx.example.com/instance'; -############################################################################## -# Google Analytics support -############################################################################## -# You can enable Google Analytics support in Evergreen by entering a -# valid Google Analytics code and changing 'false' to 'true' -############################################################################## -google_analytics.enabled = 'false'; -google_analytics.code = 'UA-9999999-99'; - ############################################################################## # Ebook API integration ############################################################################## diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 index c62df73e38..d24c0212e7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/goog_analytics.tt2 @@ -1,10 +1,11 @@ [%- PROCESS "opac/parts/header.tt2"; - IF google_analytics.enabled == 'true' %] - <script async src="https://www.googletagmanager.com/gtag/js?id=[% google_analytics.code %]"></script> + IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.google_analytics_enable'); + mygooglecode = ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.google_analytics_code'); %] + <script async src="https://www.googletagmanager.com/gtag/js?id=[% mygooglecode %]"></script> <script> window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', '[% google_analytics.code %]'); + gtag('config', '[% mygooglecode %]'); </script> [%- END %] diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc new file mode 100644 index 0000000000..622c264c46 --- /dev/null +++ b/docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc @@ -0,0 +1,8 @@ +== Move Google Analytics configuration to library settings == + +Moves the Google Analytics configuration from the config.tt2 file +in the Bootstrap OPAC to two new library settings. + +. Google Analytics: Enable (true/false) +. Google Analytics: Code (Analytics account code) + ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 25 ++++++++++++++++ .../upgrade/1459.schema.opac_google_analytics.sql | 35 ++++++++++++++++++++++ .../src/templates-bootstrap/opac/parts/config.tt2 | 9 ------ .../opac/parts/goog_analytics.tt2 | 7 +++-- .../OPAC/opac_google_analytics.adoc | 8 +++++ 6 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1459.schema.opac_google_analytics.sql create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/opac_google_analytics.adoc hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. a59c0fab59e06355a4f0f937588b0b928c17d5ba
by Git User 10 Mar '25

10 Mar '25

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 a59c0fab59e06355a4f0f937588b0b928c17d5ba (commit) via e0078f49d6fd75ae812b67ac5e694a2abdbcb67f (commit) from 301ede08847ea0d04e1795c8559fdb4de408c01a (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 a59c0fab59e06355a4f0f937588b0b928c17d5ba Author: blake <blake(a)mobiusconsortium.org> Date: Mon Mar 10 16:07:58 2025 -0500 Stamping upgrade script 1458 Signed-off-by: blake <blake(a)mobiusconsortium.org> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 544d0fa61a..3c5363363d 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 ('1457', :eg_version); -- gmcharlt/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1458', :eg_version); -- terranm/blake CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_alert_settings.sql b/Open-ILS/src/sql/Pg/upgrade/1458.schema.opac_alert_settings.sql similarity index 95% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_alert_settings.sql rename to Open-ILS/src/sql/Pg/upgrade/1458.schema.opac_alert_settings.sql index 1aa3d4e9af..95b9c3ee49 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_alert_settings.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1458.schema.opac_alert_settings.sql @@ -2,7 +2,7 @@ BEGIN; -- Move OPAC alert banner feature from config file to a library setting --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1458', :eg_version); INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) commit e0078f49d6fd75ae812b67ac5e694a2abdbcb67f Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Thu Jan 16 11:43:15 2025 -0500 LP1903873 Move OPAC alert banner to library setting Moves the control of the OPAC alert banner away from the config.tt2 file and into a trio of "OPAC Alert Banner" library settings for ease of use. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: blake <blake(a)mobiusconsortium.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> 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 a11bf8050f..f9fa215fa7 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -24906,3 +24906,37 @@ VALUES ( 'coust', 'description'), 'string' ); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.alert_banner_show', + 'opac', + oils_i18n_gettext('opac.alert_banner_show', + 'OPAC Alert Banner: Display', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_show', + 'Show an alert banner in the OPAC. Default is false.', + 'coust', 'description'), + 'bool' +), ( + 'opac.alert_banner_type', + 'opac', + oils_i18n_gettext('opac.alert_banner_type', + 'OPAC Alert Banner: Type', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_type', + 'Determine the display of the banner. Options are: success, info, warning, danger.', + 'coust', 'description'), + 'string' +), ( + 'opac.alert_banner_text', + 'opac', + oils_i18n_gettext('opac.alert_banner_text', + 'OPAC Alert Banner: Text', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_text', + 'Text that will display in the alert banner.', + 'coust', 'description'), + 'string' +); diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_alert_settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_alert_settings.sql new file mode 100644 index 0000000000..1aa3d4e9af --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.opac_alert_settings.sql @@ -0,0 +1,49 @@ +BEGIN; + +-- Move OPAC alert banner feature from config file to a library setting + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.alert_banner_show', + 'opac', + oils_i18n_gettext('opac.alert_banner_show', + 'OPAC Alert Banner: Display', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_show', + 'Show an alert banner in the OPAC. Default is false.', + 'coust', 'description'), + 'bool' +); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.alert_banner_type', + 'opac', + oils_i18n_gettext('opac.alert_banner_type', + 'OPAC Alert Banner: Type', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_type', + 'Determine the display of the banner. Options are: success, info, warning, danger.', + 'coust', 'description'), + 'string' +); + +INSERT into config.org_unit_setting_type + (name, grp, label, description, datatype) +VALUES ( + 'opac.alert_banner_text', + 'opac', + oils_i18n_gettext('opac.alert_banner_text', + 'OPAC Alert Banner: Text', + 'coust', 'label'), + oils_i18n_gettext('opac.alert_message_text', + 'Text that will display in the alert banner.', + 'coust', 'description'), + 'string' +); + + COMMIT; \ No newline at end of file diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 index b7b4403b97..29370bca34 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 @@ -192,15 +192,6 @@ search.default_highlight = 1; # Set to 1 or 'true' to enable ctx.google_books_preview = 0; -############################################################################## - -# Set a maintenance message to display in the catalogue -#ctx.maintenance_message = "<b>This OPAC will be unavailable part of March 15, 2019 for planned upgrades.</b>"; -# Maintenance types follow Bootstrap4 alert options as follows -# success = green; info = blue; warning = yellow; danger = red -# Other colors would require re-coding the alert -#ctx.maintenance_type = l('warning'); - ############################################################################## # Depth Button/Checkbox # Recommendation: Do not enable button for basic search without enabling the diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 index 6421c9d670..3b6436c6a7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 @@ -1,12 +1,13 @@ <header> -[%- IF ctx.maintenance_message -%] -<div class="alert alert-[% ctx.maintenance_type %] alert-dismissible mb-0 text-center" role="alert"> +[% IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_show') %] + <div class="alert alert-[% ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_type') | html %] <button type="button" class="close" data-dismiss="alert" aria-label="Close"> <span aria-hidden="true">×</span> - </button> -[% ctx.maintenance_message %] + </button> + [% ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'opac.alert_banner_text') | html %] </div> [%- END -%] + [% IF !ctx.is_staff %] <div id="header-wrap"> diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/opac_alert_banner.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/opac_alert_banner.adoc new file mode 100644 index 0000000000..56c6ec2404 --- /dev/null +++ b/docs/RELEASE_NOTES_NEXT/OPAC/opac_alert_banner.adoc @@ -0,0 +1,9 @@ +== Move the OPAC alert banner to a library setting == + +Moves the Bootstrap OPAC maintenance message alert banner from the config.tt2 file to a trio of new library settings. + +. OPAC Alert Banner: Display (true / false) +. OPAC Alert Banner: Text (the message that will appear) +. OPAC Alert Banner: Type (success, info, warning, danger) + +The alert banner types utilize the existing CSS to determine the color scheme. \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 34 +++++++++++++++ .../Pg/upgrade/1458.schema.opac_alert_settings.sql | 49 ++++++++++++++++++++++ .../src/templates-bootstrap/opac/parts/config.tt2 | 9 ---- .../src/templates-bootstrap/opac/parts/topnav.tt2 | 9 ++-- .../RELEASE_NOTES_NEXT/OPAC/opac_alert_banner.adoc | 9 ++++ 6 files changed, 98 insertions(+), 14 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1458.schema.opac_alert_settings.sql create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/opac_alert_banner.adoc hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 7788751a819d94850524977512389381d0df57b3
by Git User 10 Mar '25

10 Mar '25

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_13 has been updated via 7788751a819d94850524977512389381d0df57b3 (commit) from 0384911549bdf7e86adae0b3a9f0a553c2899216 (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 7788751a819d94850524977512389381d0df57b3 Author: Ian Skelskey <ianskelskey(a)gmail.com> Date: Tue Jan 28 12:01:43 2025 -0500 LP#2096865: Fix inconsistent name fields in offline patron registration The name fields in offline patron registration were not displayed consistently. The \"Primary Name\" tab is now set to expand by default, improving the initial visibility. Additionally, fields in the \"Preferred Name\" tab will appear by default when selected, resolving earlier confusion. Release-Note: Fix inconsistent display of name fields in offline patron registration Signed-off-by: Ian Skelskey <ianskelskey(a)gmail.com> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/web/js/ui/default/staff/offline.js b/Open-ILS/web/js/ui/default/staff/offline.js index 82a5d1f3be..2a251a8713 100644 --- a/Open-ILS/web/js/ui/default/staff/offline.js +++ b/Open-ILS/web/js/ui/default/staff/offline.js @@ -1521,7 +1521,8 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore , $scope.edit_passthru = {}; // 0=all, 1=suggested, 2=required - $scope.edit_passthru.vis_level = 2; + $scope.edit_passthru.vis_level = 2; + $scope.name_tab = 'primary'; // Apply default values for new patrons during initial registration // prs is shorthand for patronSvc @@ -1645,6 +1646,7 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore , 'au.passwd' : 3, 'au.first_given_name' : 3, 'au.family_name' : 3, + 'au.pref_first_given_name' : 2, 'au.ident_type' : 3, 'au.home_ou' : 3, 'au.profile' : 3, ----------------------------------------------------------------------- Summary of changes: Open-ILS/web/js/ui/default/staff/offline.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0