From 56a59155dc3c8c058345a09855d7626154e0bc53 Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Tue, 24 Jul 2018 13:19:07 -0400
Subject: [PATCH] LP#1739286: Revert "lp1739286 default search box in Z39.50"
This commit caused unexpected side effects, reported in bug 1782401
( https://bugs.launchpad.net/evergreen/+bug/1782401 ). Reverting before
it ends up in a release.
This reverts commit 6996a3630dea3d6fd967c127417a800aba561603.
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
.../templates/staff/cat/z3950/t_search_fields.tt2 | 20 +++++---------------
.../web/js/ui/default/staff/cat/services/z3950.js | 19 -------------------
2 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/Open-ILS/src/templates/staff/cat/z3950/t_search_fields.tt2 b/Open-ILS/src/templates/staff/cat/z3950/t_search_fields.tt2
index 782e40961c..61c74de4c5 100644
--- a/Open-ILS/src/templates/staff/cat/z3950/t_search_fields.tt2
+++ b/Open-ILS/src/templates/staff/cat/z3950/t_search_fields.tt2
@@ -1,19 +1,9 @@
<div class="form-horizontal">
- <div class="z3950-search-field-list row">
- <label class="col-xs-2">[% l('Default') %]</label>
- <label class="col-xs-3">[% l('Field') %]</label>
- <label class="col-xs-7">[% l('Value') %]</label>
- </div>
- <div ng-repeat="search_field in fields | orderObjectBy: 'label'" class="z3950-search-field-list row">
- <div class="col-xs-2">
- <input type="radio" name="default_field" ng-model="default_field" value="{{search_field.key}}" ng-change="save(search_field.key)"/>
- </div>
- <div class="col-xs-3">
- <label for="z3950-field-{{search_field.key}}" class="control-label">{{search_field.label}}</label>
- </div>
- <div class="col-xs-7">
- <input type="text" class="form-control" id="z3950-field-{{search_field.key}}" ng-model="search_field.query" ng-if="search_field.key != 'item_type'" focus-me="default_field == search_field.key"/>
- <select id="z3950-field-item_type" ng-if="search_field.key == 'item_type'" ng-model="search_field.query" focus-me="default_field == 'item_type'">
+ <div ng-repeat="search_field in fields | orderObjectBy: 'label'" class="z3950-search-field-list form-group">
+ <label for="z3950-field-{{search_field.key}}" class="col-xs-6 control-label">{{search_field.label}}</label>
+ <div class="col-xs-6">
+ <input type="text" class="form=control" id="z3950-field-{{search_field.key}}" ng-model="search_field.query" ng-if="search_field.key != 'item_type'">
+ <select ng-if="search_field.key == 'item_type'" ng-model="search_field.query">
<option value="">[% l('All Formats') %]</option>
<option value='art'>[% l('Papers or Articles') %]</option>
<option value='bks'>[% l('Books') %]</option>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/z3950.js b/Open-ILS/web/js/ui/default/staff/cat/services/z3950.js
index 065b4e699e..918de4bc2b 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/z3950.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/z3950.js
@@ -140,18 +140,6 @@ function($q, egCore, egAuth) {
egCore.hatch.setLocalItem('eg.cat.z3950.default_targets', saved_targets);
}
- // store default field
- service.saveDefaultField = function(default_field) {
- console.log('saveDefaultField',default_field);
- egCore.hatch.setLocalItem('eg.cat.z3950.default_field', default_field);
- }
-
- service.fetchDefaultField = function() {
- var default_field = egCore.hatch.getLocalItem('eg.cat.z3950.default_field') || 'isbn';
- console.log('fetchDefaultField',default_field);
- return default_field;
- }
-
return service;
}])
.directive("egZ3950TargetList", function () {
@@ -181,13 +169,6 @@ function($q, egCore, egAuth) {
templateUrl: './cat/z3950/t_search_fields',
link: function(scope, elem, attr) {
scope.fields = egZ3950TargetSvc.searchFields;
- scope.default_field = egZ3950TargetSvc.fetchDefaultField();
- scope.$watch('default_field', function(oldVal, newVal) {
- egZ3950TargetSvc.saveDefaultField(newVal);
- }, true);
- scope.save = function(v) { // FIXME - should be able to do this through $watch instead of ng-change
- egZ3950TargetSvc.saveDefaultField(v);
- }
}
};
}
--
2.11.0