From b5e60e16a799e12508bb66a30e9b706b03106114 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 6 Feb 2017 12:07:01 -0500
Subject: [PATCH] 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@equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 Open-ILS/src/templates/staff/cat/z3950/t_search_fields.tt2 | 2 +-
 Open-ILS/web/js/ui/default/staff/cat/z3950/app.js          | 2 +-
 2 files changed, 2 insertions(+), 2 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 753f9987b6..e62074203a 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 c8f36e95e1..b0bd16160b 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);
-- 
2.11.0