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 4cfb2c06c42f89d9aaf96cf847e44c1fd3bd7b2a (commit) via f64ff2a62c5ac6c9e85b31e01ce3f44d97a53d39 (commit) from e06aca809c5a5402cab07b764a52152c5f90b7f0 (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 4cfb2c06c42f89d9aaf96cf847e44c1fd3bd7b2a Author: Jane Sandberg <js7389@princeton.edu> Date: Tue Jul 1 16:23:59 2025 -0700 LP#2069222: stamp upgrade script Signed-off-by: Jane Sandberg <js7389@princeton.edu> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 196126068b..f3c78a39fb 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 ('1474', :eg_version); -- jeffdavis/gmcharlt/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1475', :eg_version); -- dguarracino/sandbergja CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.standing_penalty_grid.sql b/Open-ILS/src/sql/Pg/upgrade/1475.data.standing_penalty_grid.sql similarity index 83% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.standing_penalty_grid.sql rename to Open-ILS/src/sql/Pg/upgrade/1475.data.standing_penalty_grid.sql index 7cb829c6a2..c619bbbefc 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.standing_penalty_grid.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1475.data.standing_penalty_grid.sql @@ -1,6 +1,6 @@ BEGIN; --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1475', :eg_version); INSERT into config.workstation_setting_type (name, grp, datatype, label) VALUES ( commit f64ff2a62c5ac6c9e85b31e01ce3f44d97a53d39 Author: Dan Guarracino <dguarracino@owwl.org> Date: Wed Jun 25 12:10:00 2025 -0400 LP#2069222: Adds a workstation setting for eg.grid.admin.local.config.standing_penalty Adds persistKey to the standing penalty grid, allowing users to save their grid settings. To test, go to: Administration > Local Administration > Standing Penalties Without the patch, the option to save grid settings is not available. With the patch, the option is available, and changes to the grid settings are saved. Release-note: Fixes 'Save Grid Settings' for Standing Penalties. Signed-off-by: Dan Guarracino <dguarracino@owwl.org> Signed-off-by: Jane Sandberg <js7389@princeton.edu> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.html index a4e70d8ca3..f7f1e88f56 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/standing-penalty.component.html @@ -13,6 +13,7 @@ <div class="w-100 mt-2 mb-2"> <eg-grid #grid idlClass="csp" [dataSource]="cspSource" + persistKey="admin.local.config.standing_penalty" [rowFlairIsEnabled]="true" [rowFlairCallback]="cspRowFlairCallback" [cellClassCallback]="cspGridCellClassCallback" 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 b9e63f1b5b..76deb60ea9 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -21192,6 +21192,13 @@ VALUES ( 'Grid Config: admin.local.config.non_cataloged_type', 'cwst', 'label' ) +), ( + 'eg.grid.admin.local.config.standing_penalty', 'gui', 'object', + oils_i18n_gettext( + 'eg.grid.admin.local.config.standing_penalty', + 'Grid Config: admin.local.config.standing_penalty', + 'cwst', 'label' + ) ); INSERT INTO config.print_template diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.standing_penalty_grid.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.standing_penalty_grid.sql new file mode 100644 index 0000000000..7cb829c6a2 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.standing_penalty_grid.sql @@ -0,0 +1,15 @@ +BEGIN; + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +INSERT into config.workstation_setting_type (name, grp, datatype, label) +VALUES ( + 'eg.grid.admin.local.config.standing_penalty', 'gui', 'object', + oils_i18n_gettext( + 'eg.grid.admin.local.config.standing_penalty', + 'Grid Config: admin.local.config.standing_penalty', + 'cwst', 'label' + ) +); + +COMMIT; ----------------------------------------------------------------------- Summary of changes: .../app/staff/admin/local/standing-penalty.component.html | 1 + Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 7 +++++++ .../sql/Pg/upgrade/1475.data.standing_penalty_grid.sql | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1475.data.standing_penalty_grid.sql hooks/post-receive -- Evergreen ILS