[open-ils-commits] [GIT] Evergreen ILS branch master updated. 5a2c49781018101e5abf783d89e03d43d10cd635
Evergreen Git
git at git.evergreen-ils.org
Thu Feb 9 18:09:25 EST 2017
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, master has been updated
via 5a2c49781018101e5abf783d89e03d43d10cd635 (commit)
via b5e60e16a799e12508bb66a30e9b706b03106114 (commit)
via bccc71f41851b9d3d58c73bb58e5b70d227d5525 (commit)
from c9afb4556567a1997f38143c70341611894c0ec3 (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 5a2c49781018101e5abf783d89e03d43d10cd635
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu Feb 9 15:20:26 2017 -0500
LP#1541801: grab search field code correctly
When using orderObjectBy, the search field code is now
to be found in a property called 'key'.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 e620742..61c74de 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,9 +1,9 @@
<div class="form-horizontal">
- <div ng-repeat="(code, search_field) in fields | orderObjectBy: 'label'" class="z3950-search-field-list form-group">
- <label for="z3950-field-{{code}}" class="col-xs-6 control-label">{{search_field.label}}</label>
+ <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-{{code}}" ng-model="search_field.query" ng-if="code != 'item_type'">
- <select ng-if="code == 'item_type'" ng-model="search_field.query">
+ <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>
commit b5e60e16a799e12508bb66a30e9b706b03106114
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Feb 6 12:07:01 2017 -0500
LP#1541801: order search fields in Z39.50 alphabetically
This patch causes search fields in the Z39.50 search interface
in the web staff client to be place in alphabetical order by
field label.
To test:
[1] Open the Z39.50 search page in the web staff client and select
one or more search services.
[2] Verify that the list of fields is ordered alphabetically.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 753f998..e620742 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,5 +1,5 @@
<div class="form-horizontal">
- <div ng-repeat="(code, search_field) in fields" class="z3950-search-field-list form-group">
+ <div ng-repeat="(code, search_field) in fields | orderObjectBy: 'label'" class="z3950-search-field-list form-group">
<label for="z3950-field-{{code}}" class="col-xs-6 control-label">{{search_field.label}}</label>
<div class="col-xs-6">
<input type="text" class="form=control" id="z3950-field-{{code}}" ng-model="search_field.query" ng-if="code != 'item_type'">
diff --git a/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js b/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
index c8f36e9..b0bd161 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
@@ -3,7 +3,7 @@
*/
angular.module('egCatZ3950Search',
- ['ngRoute', 'ui.bootstrap', 'egCoreMod', 'egUiMod', 'egGridMod', 'egZ3950Mod', 'egMarcMod'])
+ ['ngRoute', 'ui.bootstrap', 'ngOrderObjectBy', 'egCoreMod', 'egUiMod', 'egGridMod', 'egZ3950Mod', 'egMarcMod'])
.config(function($routeProvider, $locationProvider, $compileProvider) {
$locationProvider.html5Mode(true);
commit bccc71f41851b9d3d58c73bb58e5b70d227d5525
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Feb 6 12:03:28 2017 -0500
LP#1541801: add angular-order-object-by dependency
This adds a orderObjectBy filter that permits the ordering
of results in ng-repeat when the source collection is an
object instead of any array, e.g.,
<div ng-repeat=(foo, bar) in object | orderObjectBy: 'sortfield' ...
The dependency is MIT-licensed and is copyright (c) 2015 Fabricio Quagliariello
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index fac9711..224ae0f 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -17,6 +17,7 @@
<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ngToast.min.js"></script>
<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-tree-control.js"></script>
<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/iframeResizer.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ng-order-object-by.js"></script>
<!-- IDL / opensrf (network) -->
<script src="[% ctx.media_prefix %]/js/dojo/opensrf/JSON_v1.js"></script>
diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
index 2d982c4..7015786 100644
--- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js
+++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
@@ -35,7 +35,8 @@ module.exports = function(grunt) {
'bower_components/angular-cookies/angular-cookies.min.js.map',
'bower_components/iframe-resizer/js/iframeResizer.min.js',
'bower_components/iframe-resizer/js/iframeResizer.map',
- 'bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js'
+ 'bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js',
+ 'bower_components/angular-order-object-by/src/ng-order-object-by.js'
]
}]
},
diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json
index ff2ede1..65a8539 100644
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@ -31,7 +31,8 @@
"angular-animate": "~1.5.3",
"angular-hotkeys": "cfp-angular-hotkeys#^1.7.0",
"angular-cookies": "^1.5.8",
- "iframe-resizer": "^3.5.5"
+ "iframe-resizer": "^3.5.5",
+ "angular-order-object-by": "*"
},
"resolutions": {
"angular": "~1.5.5"
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/base_js.tt2 | 1 +
.../templates/staff/cat/z3950/t_search_fields.tt2 | 8 ++++----
Open-ILS/web/js/ui/default/staff/Gruntfile.js | 3 ++-
Open-ILS/web/js/ui/default/staff/bower.json | 3 ++-
Open-ILS/web/js/ui/default/staff/cat/z3950/app.js | 2 +-
5 files changed, 10 insertions(+), 7 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list