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 25621340d82111771e7f34931396be3989d3ea14 (commit) via e6241174490671352c771f7048f02477d1ea4403 (commit) via 56fcb5b82c2d289fcc93ba3724d75a022a59e5fe (commit) from 3c56b16a87904837d3175a6435dc968d47045fd3 (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 25621340d82111771e7f34931396be3989d3ea14 Author: Michele Morgan <mmorgan@noblenet.org> Date: Mon Jul 14 14:54:22 2025 -0400 LP1721131 Stamp upgrade script Signed-off-by: Michele Morgan <mmorgan@noblenet.org> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index f3c78a39fb..3551c76de5 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 ('1475', :eg_version); -- dguarracino/sandbergja +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1476', :eg_version); -- stompro/ianskelsky/mmorgan/smorrison CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ws_setting_eg_circ_patron_search_ou.sql b/Open-ILS/src/sql/Pg/upgrade/1476.data.ws_setting_eg_circ_patron_search_ou.sql similarity index 88% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.ws_setting_eg_circ_patron_search_ou.sql rename to Open-ILS/src/sql/Pg/upgrade/1476.data.ws_setting_eg_circ_patron_search_ou.sql index 0365472c81..4a2d85b2fa 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ws_setting_eg_circ_patron_search_ou.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1476.data.ws_setting_eg_circ_patron_search_ou.sql @@ -1,6 +1,6 @@ BEGIN; --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1476', :eg_version); INSERT INTO config.workstation_setting_type (name, grp, label, description, datatype, fm_class) VALUES ( commit e6241174490671352c771f7048f02477d1ea4403 Author: Michele Morgan <mmorgan@noblenet.org> Date: Mon Jun 30 11:32:58 2025 -0400 LP#1721131: Add upgrade script and seed data for workstation setting Signed-off-by: Michele Morgan <mmorgan@noblenet.org> Signed-off-by: Susan Morrison <smorrison@georgialibraries.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 76deb60ea9..29ef6acf57 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -26056,3 +26056,18 @@ UPDATE config.org_unit_setting_type INSERT INTO config.usr_setting_type (name,label,grp) VALUES ('REST.api.whitelist_properties','Globally whitelisted Fieldmapper properties','openapi'); INSERT INTO config.usr_setting_type (name,label,grp) VALUES ('REST.api.blacklist_properties','Globally filtered Fieldmapper properties','openapi'); +INSERT INTO config.workstation_setting_type (name, grp, label, description, datatype, fm_class) +VALUES ( + 'eg.circ.patron.search.ou', + 'circ', + oils_i18n_gettext( + 'eg.circ.patron.search.ou', + 'Staff Client patron search: home organization unit', + 'cwst', 'label'), + oils_i18n_gettext( + 'eg.circ.patron.search.ou', + 'Specifies the home organization unit for patron search', + 'cwst', 'description'), + 'link', + 'aou' +); diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ws_setting_eg_circ_patron_search_ou.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ws_setting_eg_circ_patron_search_ou.sql new file mode 100644 index 0000000000..0365472c81 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ws_setting_eg_circ_patron_search_ou.sql @@ -0,0 +1,21 @@ +BEGIN; + +-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +INSERT INTO config.workstation_setting_type (name, grp, label, description, datatype, fm_class) +VALUES ( + 'eg.circ.patron.search.ou', + 'circ', + oils_i18n_gettext( + 'eg.circ.patron.search.ou', + 'Staff Client patron search: home organization unit', + 'cwst', 'label'), + oils_i18n_gettext( + 'eg.circ.patron.search.ou', + 'Specifies the home organization unit for patron search', + 'cwst', 'description'), + 'link', + 'aou' + ); + +COMMIT; commit 56fcb5b82c2d289fcc93ba3724d75a022a59e5fe Author: Ian Skelskey <ianskelskey@gmail.com> Date: Mon Jan 27 11:49:00 2025 -0500 LP#1721131: Update Clear Form behavior in patron search Revises the behavior of the Clear Form button in the patron search interface: - \"Home Library\" will reset to the highest org level (CONS) upon form clearing. - \"Include Inactive\" will retain its sticky setting, whether checked or unchecked. - Addresses issues where settings were not persisting across sessions. Release-Note: Clear Form now resets \"Home Library\" to consortium and retains the sticky setting for \"Include Inactive.\" Testing Plan: 1. Open the Patron Search page and set \"Home Library\" to an org other than CONS. 2. Click \"Clear Form\" and ensure \"Home Library\" resets to CONS. 3. Verify \"Include Inactive\" retains its previous setting. 4. Refresh the page and confirm settings persist appropriately. Co-authored-by: Josh Stompro <stompro@stompro.org> Signed-off-by: Ian Skelskey <ianskelskey@gmail.com> Signed-off-by: Michele Morgan <mmorgan@noblenet.org> diff --git a/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2 b/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2 index bec2aa6f0a..8f5fd86d68 100644 --- a/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2 +++ b/Open-ILS/src/templates/staff/share/t_patron_search_form.tt2 @@ -91,8 +91,8 @@ </ul> </div> - <eg-org-selector ng-show="showExtras" label="[% l('Home Library') %]" org-aria="[% l('Home Library') %]" - selected="searchArgs.home_ou" sticky-setting="eg.circ.patron.search.ou"> + <eg-org-selector ng-show="showExtras" label="[% l('Home Library') %]" org-aria="[% l('Home Library') %]" + selected="searchArgs.home_ou" sticky-setting="eg.circ.patron.search.ou"> </eg-org-selector> <input ng-show="showExtras" type="text" class="form-control" aria-label="[% l('Parent/Guardian') %]" @@ -121,7 +121,7 @@ </div> <div ng-show="showExtras" class="actions-reset" ng-show="showExtras" ng-mouseover="setLastFormElement()"> - <input type="reset" class="btn btn-outline-primary" ng-click="clearForm()" + <input type="button" class="btn btn-outline-primary" ng-click="clearForm()" aria-label="[% l('Clear Form') %]" value="[% l('Clear Form') %]"/> </div> <div class="actions-search" ng-mouseover="setLastFormElement()"> diff --git a/Open-ILS/web/js/ui/default/staff/services/patron_search.js b/Open-ILS/web/js/ui/default/staff/services/patron_search.js index 798bd9db12..b31fbc4374 100644 --- a/Open-ILS/web/js/ui/default/staff/services/patron_search.js +++ b/Open-ILS/web/js/ui/default/staff/services/patron_search.js @@ -745,7 +745,13 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore, } $scope.clearForm = function () { - $scope.searchArgs={}; + var inactive = $scope.searchArgs.inactive; + var home_ou = egCore.org.tree(); + $scope.searchArgs = { + home_ou: home_ou, + inactive: inactive + }; + egCore.hatch.setItem('eg.circ.patron.search.ou', home_ou); if (lastFormElement) lastFormElement.focus(); } @@ -770,10 +776,28 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore, if (searchInactive) $scope.searchArgs.inactive = searchInactive; }); + egCore.hatch.getItem('eg.circ.patron.search.ou').then(function(cachedHomeOu) { + $scope.searchArgs.home_ou = cachedHomeOu || egCore.org.tree(); + // Once done, mark ourselves as ready + $scope.initialized = true; + }); + $scope.onSearchInactiveChanged = function() { egCore.hatch.setItem('eg.circ.patron.search.include_inactive', $scope.searchArgs.inactive); } + // Then watch the home_ou for actual user changes + $scope.$watch('searchArgs.home_ou', function(newVal, oldVal) { + // If not initialized, ignore. The first assignment is from the cached value. + if (!$scope.initialized) return; + if (newVal !== oldVal) { + egCore.hatch.setItem( + 'eg.circ.patron.search.ou', + $scope.searchArgs.home_ou + ); + } + }); + // map form arguments into search params function compileSearch(args) { var search = {}; @@ -782,7 +806,7 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore, if (key == 'profile' && args.profile) { search.profile = {value : args.profile.id(), group : 5}; } else if (key == 'home_ou' && args.home_ou) { - search.home_ou = args.home_ou.id(); // passed separately + search.home_ou = args.home_ou.id(); } else if (key == 'inactive') { search.inactive = val; } else if (key == 'name') { // name keywords search @@ -812,7 +836,7 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore, } } }); - + return search; } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 15 +++++++++++ ...76.data.ws_setting_eg_circ_patron_search_ou.sql | 21 +++++++++++++++ .../templates/staff/share/t_patron_search_form.tt2 | 6 ++--- .../js/ui/default/staff/services/patron_search.js | 30 +++++++++++++++++++--- 5 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1476.data.ws_setting_eg_circ_patron_search_ou.sql hooks/post-receive -- Evergreen ILS