April 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch rel_3_15 updated. dffe1bb95d0ea74a86d0421d4a76903defd60cb7
by Git User 28 Apr '25

28 Apr '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_15 has been updated via dffe1bb95d0ea74a86d0421d4a76903defd60cb7 (commit) from dd969a5e4b0e582a3e524e86f3ab221b7f19fa80 (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 dffe1bb95d0ea74a86d0421d4a76903defd60cb7 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Apr 2 23:16:16 2025 +0000 LP2092293 Fix selected overdue, lost bill row colors Corrects the circ billing grid background color for selected rows with overdue and lost items. Release-note: Corrects the circ billing grid background color for selected rows with overdue and lost items. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index c0ea0761d5..924b115fd1 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -291,7 +291,7 @@ table.list tr.selected td { /* deprecated? */ /* background colors are !important because Bootstrap 4 table striping is greedy */ .overdue-row { color: var(--bs-body-color); - background-color: rgba(var(--bs-orange-rgb), 0.10); + background-color: rgba(var(--bs-orange-rgb), 0.10) !important; border-color: rgba(var(--bs-orange-rgb), 0.15); border-left: 10px solid var(--bs-orange); padding-left: 0; @@ -325,7 +325,7 @@ table.list tr.selected td { /* deprecated? */ .lost-row { color: var(--bs-body-color); - background-color: rgba(var(--bs-red-rgb), 0.25); + background-color: rgba(var(--bs-red-rgb), 0.25) !important; border-color: rgba(var(--bs-red-rgb), 0.30); border-left: 2px solid var(--bs-red-600); padding-left: 0; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates/staff/css/style.css.tt2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 5f958ee28fcf2b036af146100d5ae68910e6a3b8
by Git User 28 Apr '25

28 Apr '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 5f958ee28fcf2b036af146100d5ae68910e6a3b8 (commit) from f2120a5ece7d017d7628d85be221303fdaa38db4 (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 5f958ee28fcf2b036af146100d5ae68910e6a3b8 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Apr 2 23:16:16 2025 +0000 LP2092293 Fix selected overdue, lost bill row colors Corrects the circ billing grid background color for selected rows with overdue and lost items. Release-note: Corrects the circ billing grid background color for selected rows with overdue and lost items. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index c0ea0761d5..924b115fd1 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -291,7 +291,7 @@ table.list tr.selected td { /* deprecated? */ /* background colors are !important because Bootstrap 4 table striping is greedy */ .overdue-row { color: var(--bs-body-color); - background-color: rgba(var(--bs-orange-rgb), 0.10); + background-color: rgba(var(--bs-orange-rgb), 0.10) !important; border-color: rgba(var(--bs-orange-rgb), 0.15); border-left: 10px solid var(--bs-orange); padding-left: 0; @@ -325,7 +325,7 @@ table.list tr.selected td { /* deprecated? */ .lost-row { color: var(--bs-body-color); - background-color: rgba(var(--bs-red-rgb), 0.25); + background-color: rgba(var(--bs-red-rgb), 0.25) !important; border-color: rgba(var(--bs-red-rgb), 0.30); border-left: 2px solid var(--bs-red-600); padding-left: 0; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates/staff/css/style.css.tt2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. fd26d0fcd024dab8d0268aeb3c94dd2f7a117d00
by Git User 28 Apr '25

28 Apr '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 fd26d0fcd024dab8d0268aeb3c94dd2f7a117d00 (commit) from cb22f90f2894128eab8a38886e927a96ef2b5c15 (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 fd26d0fcd024dab8d0268aeb3c94dd2f7a117d00 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Apr 2 23:16:16 2025 +0000 LP2092293 Fix selected overdue, lost bill row colors Corrects the circ billing grid background color for selected rows with overdue and lost items. Release-note: Corrects the circ billing grid background color for selected rows with overdue and lost items. Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index c0ea0761d5..924b115fd1 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -291,7 +291,7 @@ table.list tr.selected td { /* deprecated? */ /* background colors are !important because Bootstrap 4 table striping is greedy */ .overdue-row { color: var(--bs-body-color); - background-color: rgba(var(--bs-orange-rgb), 0.10); + background-color: rgba(var(--bs-orange-rgb), 0.10) !important; border-color: rgba(var(--bs-orange-rgb), 0.15); border-left: 10px solid var(--bs-orange); padding-left: 0; @@ -325,7 +325,7 @@ table.list tr.selected td { /* deprecated? */ .lost-row { color: var(--bs-body-color); - background-color: rgba(var(--bs-red-rgb), 0.25); + background-color: rgba(var(--bs-red-rgb), 0.25) !important; border-color: rgba(var(--bs-red-rgb), 0.30); border-left: 2px solid var(--bs-red-600); padding-left: 0; ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates/staff/css/style.css.tt2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. dd969a5e4b0e582a3e524e86f3ab221b7f19fa80
by Git User 28 Apr '25

28 Apr '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_15 has been updated via dd969a5e4b0e582a3e524e86f3ab221b7f19fa80 (commit) via bbf9f8eb07e15740384cb717f5b1d9fd30006956 (commit) from 78c87a47c4a4c0c3aa359dbd115d02dd035aa668 (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 dd969a5e4b0e582a3e524e86f3ab221b7f19fa80 Author: Michele Morgan <mmorgan(a)noblenet.org> Date: Tue Mar 25 14:42:28 2025 -0400 LP#2080899: BOOPAC: Disable Submit Payment Button when no amount selected Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index afc428d74a..03716f5766 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -244,6 +244,7 @@ $( document ).ready(function() { }); $("#total").val(amount); $("#selectPay").html('<i class="fas fa-money-bill-wave" aria-hidden="true"></i> [% l('Pay Selected Charges') %] - $' + amount.toFixed(2)); + $("#selectPay").prop('disabled', (amount == 0)); }); }); commit bbf9f8eb07e15740384cb717f5b1d9fd30006956 Author: Michele Morgan <mmorgan(a)noblenet.org> Date: Mon Sep 16 17:08:32 2024 -0400 lp2080899 Prevent payment when no charges selected Adds code to disable the Submit Payment button if no checkboxes are selected. Release-note: Disables the Pay Selected Charges button when none are selected. Co-authored-by: Christine Morgan <cmorgan(a)noblenet.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2 index ddf26ae5db..5d7b9d4289 100644 --- a/Open-ILS/src/templates/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main.tt2 @@ -47,6 +47,7 @@ <th nowrap="nowrap" style="white-space:nowrap;"> <input id="pay_fines_box1" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact', this.checked)" + onchange=canSubmitPayment(event) title="[% l('Click to (un)select all charges') %]" /> </th> [% END %] @@ -73,7 +74,7 @@ <tr id='myopac_circ_trans_row'> [% IF myopac_cc_allowed %] <td> - <input type="checkbox" checked="checked" + <input type="checkbox" checked="checked" onchange=canSubmitPayment(event) title="[% l('Pay this fine') %]" name="xact" value="[% f.xact.id %]" /> </td> @@ -159,6 +160,7 @@ <th nowrap="nowrap" style="white-space:nowrap;"> <input id="pay_fines_box2" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)" + onchange=canSubmitPayment(event) title="[% l('Click to (un)select all fines') %]" /> </th> [% END %] @@ -177,7 +179,7 @@ [% IF myopac_cc_allowed %] <td > <input type="checkbox" title='[% l("Pay this fine") %]' - name="xact_misc" value="[% f.xact.id %]" + name="xact_misc" value="[% f.xact.id %]" onchange=canSubmitPayment(event) checked="checked" /> </td> [% END %] diff --git a/Open-ILS/web/js/ui/default/opac/simple.js b/Open-ILS/web/js/ui/default/opac/simple.js index 991971b509..b31abb14ba 100644 --- a/Open-ILS/web/js/ui/default/opac/simple.js +++ b/Open-ILS/web/js/ui/default/opac/simple.js @@ -361,4 +361,22 @@ function displayAlert(elementID) { el.classList.remove('d-none'); // fade out after 8 seconds setTimeout(() => {document.getElementById(elementID).classList.add('d-none')}, 8000); -} \ No newline at end of file +} + +function canSubmitPayment(evt){ + // check that charges are selected in opac for payment + // enable the submit payment button if they are + var form = document.getElementById('selected_fines'); + var submit = form.querySelector('input[type="submit"]'); + if (!form || !submit) return; + var els = form.elements; + for (i = 0; i < els.length; i++){ + var e = els[i]; + if (e.type == "checkbox" && !e.hidden && e.checked){ + submit.removeAttribute("disabled"); + return; + } + } + + submit.setAttribute("disabled",""); +} ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/myopac/charges.tt2 | 1 + Open-ILS/src/templates/opac/myopac/main.tt2 | 6 ++++-- Open-ILS/web/js/ui/default/opac/simple.js | 20 +++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. f2120a5ece7d017d7628d85be221303fdaa38db4
by Git User 28 Apr '25

28 Apr '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 f2120a5ece7d017d7628d85be221303fdaa38db4 (commit) via fc15de492827caa165c028c743b788f6ea43623e (commit) from 3eef6751dcabc2c44703d91d1ea523df92ba5eb0 (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 f2120a5ece7d017d7628d85be221303fdaa38db4 Author: Michele Morgan <mmorgan(a)noblenet.org> Date: Tue Mar 25 14:42:28 2025 -0400 LP#2080899: BOOPAC: Disable Submit Payment Button when no amount selected Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index 612d4649f5..0597e66a49 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -245,6 +245,7 @@ $( document ).ready(function() { }); $("#total").val(amount); $("#selectPay").html('<i class="fas fa-money-bill-wave" aria-hidden="true"></i> [% l('Pay Selected Charges') %] - $' + amount.toFixed(2)); + $("#selectPay").prop('disabled', (amount == 0)); }); }); commit fc15de492827caa165c028c743b788f6ea43623e Author: Michele Morgan <mmorgan(a)noblenet.org> Date: Mon Sep 16 17:08:32 2024 -0400 lp2080899 Prevent payment when no charges selected Adds code to disable the Submit Payment button if no checkboxes are selected. Release-note: Disables the Pay Selected Charges button when none are selected. Co-authored-by: Christine Morgan <cmorgan(a)noblenet.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2 index ddf26ae5db..5d7b9d4289 100644 --- a/Open-ILS/src/templates/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main.tt2 @@ -47,6 +47,7 @@ <th nowrap="nowrap" style="white-space:nowrap;"> <input id="pay_fines_box1" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact', this.checked)" + onchange=canSubmitPayment(event) title="[% l('Click to (un)select all charges') %]" /> </th> [% END %] @@ -73,7 +74,7 @@ <tr id='myopac_circ_trans_row'> [% IF myopac_cc_allowed %] <td> - <input type="checkbox" checked="checked" + <input type="checkbox" checked="checked" onchange=canSubmitPayment(event) title="[% l('Pay this fine') %]" name="xact" value="[% f.xact.id %]" /> </td> @@ -159,6 +160,7 @@ <th nowrap="nowrap" style="white-space:nowrap;"> <input id="pay_fines_box2" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)" + onchange=canSubmitPayment(event) title="[% l('Click to (un)select all fines') %]" /> </th> [% END %] @@ -177,7 +179,7 @@ [% IF myopac_cc_allowed %] <td > <input type="checkbox" title='[% l("Pay this fine") %]' - name="xact_misc" value="[% f.xact.id %]" + name="xact_misc" value="[% f.xact.id %]" onchange=canSubmitPayment(event) checked="checked" /> </td> [% END %] diff --git a/Open-ILS/web/js/ui/default/opac/simple.js b/Open-ILS/web/js/ui/default/opac/simple.js index 991971b509..b31abb14ba 100644 --- a/Open-ILS/web/js/ui/default/opac/simple.js +++ b/Open-ILS/web/js/ui/default/opac/simple.js @@ -361,4 +361,22 @@ function displayAlert(elementID) { el.classList.remove('d-none'); // fade out after 8 seconds setTimeout(() => {document.getElementById(elementID).classList.add('d-none')}, 8000); -} \ No newline at end of file +} + +function canSubmitPayment(evt){ + // check that charges are selected in opac for payment + // enable the submit payment button if they are + var form = document.getElementById('selected_fines'); + var submit = form.querySelector('input[type="submit"]'); + if (!form || !submit) return; + var els = form.elements; + for (i = 0; i < els.length; i++){ + var e = els[i]; + if (e.type == "checkbox" && !e.hidden && e.checked){ + submit.removeAttribute("disabled"); + return; + } + } + + submit.setAttribute("disabled",""); +} ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/myopac/charges.tt2 | 1 + Open-ILS/src/templates/opac/myopac/main.tt2 | 6 ++++-- Open-ILS/web/js/ui/default/opac/simple.js | 20 +++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. cb22f90f2894128eab8a38886e927a96ef2b5c15
by Git User 28 Apr '25

28 Apr '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 cb22f90f2894128eab8a38886e927a96ef2b5c15 (commit) via 78365c1bd9d8f380824b2553ecd282c8f840aecd (commit) from 6f076e7192aae7496ed9394ac95c529ad8b71602 (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 cb22f90f2894128eab8a38886e927a96ef2b5c15 Author: Michele Morgan <mmorgan(a)noblenet.org> Date: Tue Mar 25 14:42:28 2025 -0400 LP#2080899: BOOPAC: Disable Submit Payment Button when no amount selected Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index afc428d74a..03716f5766 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -244,6 +244,7 @@ $( document ).ready(function() { }); $("#total").val(amount); $("#selectPay").html('<i class="fas fa-money-bill-wave" aria-hidden="true"></i> [% l('Pay Selected Charges') %] - $' + amount.toFixed(2)); + $("#selectPay").prop('disabled', (amount == 0)); }); }); commit 78365c1bd9d8f380824b2553ecd282c8f840aecd Author: Michele Morgan <mmorgan(a)noblenet.org> Date: Mon Sep 16 17:08:32 2024 -0400 lp2080899 Prevent payment when no charges selected Adds code to disable the Submit Payment button if no checkboxes are selected. Release-note: Disables the Pay Selected Charges button when none are selected. Co-authored-by: Christine Morgan <cmorgan(a)noblenet.org> Signed-off-by: Michele Morgan <mmorgan(a)noblenet.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Jane Sandberg <js7389(a)princeton.edu> diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2 index ddf26ae5db..5d7b9d4289 100644 --- a/Open-ILS/src/templates/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main.tt2 @@ -47,6 +47,7 @@ <th nowrap="nowrap" style="white-space:nowrap;"> <input id="pay_fines_box1" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact', this.checked)" + onchange=canSubmitPayment(event) title="[% l('Click to (un)select all charges') %]" /> </th> [% END %] @@ -73,7 +74,7 @@ <tr id='myopac_circ_trans_row'> [% IF myopac_cc_allowed %] <td> - <input type="checkbox" checked="checked" + <input type="checkbox" checked="checked" onchange=canSubmitPayment(event) title="[% l('Pay this fine') %]" name="xact" value="[% f.xact.id %]" /> </td> @@ -159,6 +160,7 @@ <th nowrap="nowrap" style="white-space:nowrap;"> <input id="pay_fines_box2" checked="checked" type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)" + onchange=canSubmitPayment(event) title="[% l('Click to (un)select all fines') %]" /> </th> [% END %] @@ -177,7 +179,7 @@ [% IF myopac_cc_allowed %] <td > <input type="checkbox" title='[% l("Pay this fine") %]' - name="xact_misc" value="[% f.xact.id %]" + name="xact_misc" value="[% f.xact.id %]" onchange=canSubmitPayment(event) checked="checked" /> </td> [% END %] diff --git a/Open-ILS/web/js/ui/default/opac/simple.js b/Open-ILS/web/js/ui/default/opac/simple.js index 991971b509..b31abb14ba 100644 --- a/Open-ILS/web/js/ui/default/opac/simple.js +++ b/Open-ILS/web/js/ui/default/opac/simple.js @@ -361,4 +361,22 @@ function displayAlert(elementID) { el.classList.remove('d-none'); // fade out after 8 seconds setTimeout(() => {document.getElementById(elementID).classList.add('d-none')}, 8000); -} \ No newline at end of file +} + +function canSubmitPayment(evt){ + // check that charges are selected in opac for payment + // enable the submit payment button if they are + var form = document.getElementById('selected_fines'); + var submit = form.querySelector('input[type="submit"]'); + if (!form || !submit) return; + var els = form.elements; + for (i = 0; i < els.length; i++){ + var e = els[i]; + if (e.type == "checkbox" && !e.hidden && e.checked){ + submit.removeAttribute("disabled"); + return; + } + } + + submit.setAttribute("disabled",""); +} ----------------------------------------------------------------------- Summary of changes: .../src/templates-bootstrap/opac/myopac/charges.tt2 | 1 + Open-ILS/src/templates/opac/myopac/main.tt2 | 6 ++++-- Open-ILS/web/js/ui/default/opac/simple.js | 20 +++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 6f076e7192aae7496ed9394ac95c529ad8b71602
by Git User 22 Apr '25

22 Apr '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 6f076e7192aae7496ed9394ac95c529ad8b71602 (commit) from d6f4414afb5237cddc3f659b2ae633c1f688851b (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 6f076e7192aae7496ed9394ac95c529ad8b71602 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Apr 11 15:10:45 2025 +0000 LP2107116 Restore toast dismiss function Restores the dismiss() function in the toast component, which allows users to close specific toasts before they expire by clicking the close ('X') button. This was accidentally removed in bug 2103619, which added support for multiple toast messages. Release-note: Restores ability to dismiss toasts by clicking 'X' button Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: blake <blake(a)mobiusconsortium.org> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html index 221bcc98e9..6a2e91395d 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html @@ -1,8 +1,10 @@ <output id="eg-toast-container" role="status"> <ul *ngIf="messages.length" class="list-unstyled"> - <li *ngFor="let message of messages" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> - {{message.text}} - <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss()"></button> - </li> + <ng-container *ngFor="let message of messages; index as i"> + <li *ngIf="message && message.text" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> + {{message.text}} + <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss(i)"></button> + </li> + </ng-container> </ul> </output> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts index 341340724b..97649031e5 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts @@ -42,6 +42,11 @@ export class ToastComponent implements OnInit { this.duration ); } + + // delete a specific toast when user clicks the 'x' button + dismiss(index: number) { + this.messages[index] = null; + } } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/toast/toast.component.html | 10 ++++++---- Open-ILS/src/eg2/src/app/share/toast/toast.component.ts | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 78c87a47c4a4c0c3aa359dbd115d02dd035aa668
by Git User 22 Apr '25

22 Apr '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_15 has been updated via 78c87a47c4a4c0c3aa359dbd115d02dd035aa668 (commit) from 39e44b53bcdd0f842a2c13bd9e465f4dcad8a488 (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 78c87a47c4a4c0c3aa359dbd115d02dd035aa668 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Apr 11 15:10:45 2025 +0000 LP2107116 Restore toast dismiss function Restores the dismiss() function in the toast component, which allows users to close specific toasts before they expire by clicking the close ('X') button. This was accidentally removed in bug 2103619, which added support for multiple toast messages. Release-note: Restores ability to dismiss toasts by clicking 'X' button Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: blake <blake(a)mobiusconsortium.org> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html index 221bcc98e9..6a2e91395d 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html @@ -1,8 +1,10 @@ <output id="eg-toast-container" role="status"> <ul *ngIf="messages.length" class="list-unstyled"> - <li *ngFor="let message of messages" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> - {{message.text}} - <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss()"></button> - </li> + <ng-container *ngFor="let message of messages; index as i"> + <li *ngIf="message && message.text" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> + {{message.text}} + <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss(i)"></button> + </li> + </ng-container> </ul> </output> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts index 8e01cd0b42..5d45cc325f 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts @@ -42,6 +42,11 @@ export class ToastComponent implements OnInit { this.duration ); } + + // delete a specific toast when user clicks the 'x' button + dismiss(index: number) { + this.messages[index] = null; + } } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/toast/toast.component.html | 10 ++++++---- Open-ILS/src/eg2/src/app/share/toast/toast.component.ts | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 3eef6751dcabc2c44703d91d1ea523df92ba5eb0
by Git User 22 Apr '25

22 Apr '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 3eef6751dcabc2c44703d91d1ea523df92ba5eb0 (commit) from 47f6b139fa26d069a4e54873e67f8af716170ecd (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 3eef6751dcabc2c44703d91d1ea523df92ba5eb0 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Apr 11 15:10:45 2025 +0000 LP2107116 Restore toast dismiss function Restores the dismiss() function in the toast component, which allows users to close specific toasts before they expire by clicking the close ('X') button. This was accidentally removed in bug 2103619, which added support for multiple toast messages. Release-note: Restores ability to dismiss toasts by clicking 'X' button Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: blake <blake(a)mobiusconsortium.org> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html index 221bcc98e9..6a2e91395d 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.html +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.html @@ -1,8 +1,10 @@ <output id="eg-toast-container" role="status"> <ul *ngIf="messages.length" class="list-unstyled"> - <li *ngFor="let message of messages" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> - {{message.text}} - <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss()"></button> - </li> + <ng-container *ngFor="let message of messages; index as i"> + <li *ngIf="message && message.text" class="alert alert-{{message.style}} alert-dismissible border-2 fade shadow-lg show"> + {{message.text}} + <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close alert" (click)="dismiss(i)"></button> + </li> + </ng-container> </ul> </output> diff --git a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts index 8e01cd0b42..5d45cc325f 100644 --- a/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts +++ b/Open-ILS/src/eg2/src/app/share/toast/toast.component.ts @@ -42,6 +42,11 @@ export class ToastComponent implements OnInit { this.duration ); } + + // delete a specific toast when user clicks the 'x' button + dismiss(index: number) { + this.messages[index] = null; + } } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/share/toast/toast.component.html | 10 ++++++---- Open-ILS/src/eg2/src/app/share/toast/toast.component.ts | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 47f6b139fa26d069a4e54873e67f8af716170ecd
by Git User 21 Apr '25

21 Apr '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 47f6b139fa26d069a4e54873e67f8af716170ecd (commit) from 8c90a487ecf0b75b5fd99792d32273d4b4182b0f (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 47f6b139fa26d069a4e54873e67f8af716170ecd Author: Mike Rylander <mrylander(a)gmail.com> Date: Thu Apr 10 15:41:00 2025 -0400 LP#2092695: Add field info to report template table aliases When calculating the alias to use for a table in a report, we need to include the linking column names to disambiguate which "version" of the joined table we're passing through in a particular join path. This commit does that whenever there is column-level data available. To test: 1) Create a template starting from the Hold Transit source that displays the Shortname of the Sending Library AND the Destination Library. See that the template cause an error when run. 2) Apply this patch, and then clone the template from (1). See that the report runs correctly. NOTE: To fix templates without having to clone them and then clean up the old ones, you can choose the Clone action on the template, change the URL path component from "clone" to "edit" once it loads, and then save the template. The join aliases are calculated when the template is saved, so this will repair the template in place. Release-note: Fix report table alias calculation for joins Signed-off-by: Mike Rylander <mrylander(a)gmail.com> Signed-off-by: Galen Charlton <gmc(a)equinoxOLI.org> diff --git a/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts b/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts index c19ec2078a..c7cf9a37ac 100644 --- a/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts @@ -1509,6 +1509,9 @@ export class ReporterService { pathHash += ' -> '; if (n.stateFlag) {pathHash += ' [Required]';} } + if (n.callerData.fmField?.name) { + pathHash += n.callerData.fmField.name + '.'; + } pathHash += n.callerData.fmClass; }); return Md5.hashStr(pathHash); ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Evergreen ILS

1 0