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 e0d8804bdbf64ee5cd2a09c537ab87d2e3b80259 (commit) via 8c4180faae68491fab36a04688d6074cae9622e4 (commit) from ea83ead3ec1eb198e32c68dffbeb341b5deeb89a (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 e0d8804bdbf64ee5cd2a09c537ab87d2e3b80259 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Fri Mar 21 23:36:56 2025 +0000 LP2074111 Leave breadcrumbs to catalog prefs Adds a link to the staff catalog preferences page where the old workstation preferences used to be. Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Susan Morrison <smorrison@georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 index 69cf31ad69..86deb73d10 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 @@ -116,7 +116,13 @@ </div> </div><!-- left column --> - + <div class="col-md-6"><!-- right page column --> + <div class="row new-entry"> + <div class="col"> + <a href="/eg2/staff/catalog/prefs">[% l('Search Preferences in the catalog →') %]</a> + </div> + </div> + </div><!-- right column --> </div><!-- row --> </div> commit 8c4180faae68491fab36a04688d6074cae9622e4 Author: Terran McCanna <tmccanna@georgialibraries.org> Date: Mon Feb 3 17:25:08 2025 -0500 LP2074111 Remove Search Prefs from Workstation Menu The Angular Staff Catalog Search Preferences page has replaced and expanded upon the three settings on the Workstation splash page. This patch removes the three catalog preferences from the Workstation splash page along with their associated javascript. Release-note: Removes search preferences from Workstation splash page. Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 index c3bc35972f..69cf31ad69 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 @@ -116,54 +116,7 @@ </div> </div><!-- left column --> - <div class="col-md-6"><!-- right column --> - <div class="row"> - <div class="col-md-8"> - <label for="search_lib_selector">[% l('Default Search Library') %]</label> - <p>[% l('The default search library setting determines what library is searched from the advanced search screen and portal page by default. Manual selection of a search library will override it. One recommendation is to set the search library to the highest point you would normally want to search.') %]</p> - </div> - <div class="col-md-4"> - <eg-org-selector id="search_lib_selector" - selected="search_lib" nodefault - label="[% l('Select...') %]" - onchange="handle_search_lib_changed"> - </eg-org-selector> - </div> - </div><!-- row --> - - <div class="row new-entry"> - <div class="col-md-8"> - <label for="pref_lib_selector">[% l('Preferred Library') %]</label> - <p>[% l('The preferred library is used to show copies and URIs regardless of the library searched. One recommendation is to set this to your workstation library so that local copies show up first in search results.') %]</p> - </div> - <div class="col-md-4"> - <eg-org-selector id="pref_lib_selector" - selected="pref_lib" nodefault - label="[% l('Select...') %]" - onchange="handle_pref_lib_changed"> - </eg-org-selector> - </div> - </div> - - <div class="row new-entry"> - <div class="col-md-8"> - <label for="adv_pane_selector">[% l('Advanced Search Default Pane') %]</label> - <p>[% l('Advanced search has secondary panes for Numeric and MARC Expert searching. You can change which one is loaded by default when opening a new catalog window here.') %]</p> - </div> - <div class="col-md-4"> - <select id="adv_pane_selector" ng-model="adv_pane"> - <option value="advanced">[% l('Advanced (default)') %]</option> - <option value="numeric" >[% l('Numeric') %]</option> - <option value="expert" >[% l('MARC Expert') %]</option> - </select> - </div> - </div> - - </div><!-- col --> </div><!-- row --> - - - </div> diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js index 6b8aeeaa42..ad4d0b61c9 100644 --- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js +++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js @@ -188,30 +188,6 @@ function($scope , $window , $location , egCore , egConfirmDialog) { $scope.disable_links_newtabs = val; }); - egCore.hatch.getItem('eg.search.search_lib').then(function(val) { - $scope.search_lib = egCore.org.get(val); - }); - $scope.handle_search_lib_changed = function(org) { - egCore.hatch.setItem('eg.search.search_lib', org.id()); - }; - - egCore.hatch.getItem('eg.search.pref_lib').then(function(val) { - $scope.pref_lib = egCore.org.get(val); - }); - $scope.handle_pref_lib_changed = function(org) { - egCore.hatch.setItem('eg.search.pref_lib', org.id()); - }; - - $scope.adv_pane = 'advanced'; // default value if not explicitly set - egCore.hatch.getItem('eg.search.adv_pane').then(function(val) { - $scope.adv_pane = val; - }); - $scope.$watch('adv_pane', function(newVal, oldVal) { - if (typeof newVal != 'undefined' && newVal != oldVal) { - egCore.hatch.setItem('eg.search.adv_pane', newVal); - } - }); - $scope.apply_sound = function() { if ($scope.disable_sound) { egCore.hatch.setItem('eg.audio.disable', true); ----------------------------------------------------------------------- Summary of changes: .../templates/staff/admin/workstation/t_splash.tt2 | 49 ++-------------------- .../js/ui/default/staff/admin/workstation/app.js | 24 ----------- 2 files changed, 4 insertions(+), 69 deletions(-) hooks/post-receive -- Evergreen ILS