[open-ils-commits] [GIT] Evergreen ILS branch master updated. f4eee80b1ad23e52912883dfa8ddec7438ab2d5e

[Evergreen Git]

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  f4eee80b1ad23e52912883dfa8ddec7438ab2d5e (commit)
      from  55e249f33b8c10b8665b7fd03083bb5aa04e5592 (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 f4eee80b1ad23e52912883dfa8ddec7438ab2d5e
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Fri Aug 17 10:32:31 2018 -0700

    LP#1787676: sort Z39.50 sources in JS, retaining Local Catalog at top of list
    
    This reverts the original fix for LP#1119370.
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/cat/z3950/t_target.tt2 b/Open-ILS/src/templates/staff/cat/z3950/t_target.tt2
index 0ca0e6cf74..17ca47588e 100644
--- a/Open-ILS/src/templates/staff/cat/z3950/t_target.tt2
+++ b/Open-ILS/src/templates/staff/cat/z3950/t_target.tt2
@@ -1,4 +1,4 @@
-<div ng-repeat="target in targets | orderBy:'settings.label'" class="z3950-target-list">
+<div ng-repeat="target in targets" class="z3950-target-list">
     <div class="checkbox">
         <input ng-model="target.selected" type="checkbox">
     <div>
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 0f1242266d..4eb3b867f5 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
@@ -36,8 +36,8 @@ function($q,   egCore,   egAuth) {
                 this.push(tgt);
             }, service.targets);
             service.targets.sort(function (a, b) {
-                a = a.settings.label;
-                b = b.settings.label;
+                a = a.settings.label.toLowerCase();
+                b = b.settings.label.toLowerCase();
                 return a < b ? -1 : (a > b ? 1 : 0);
             }); 
             service.targets.unshift({

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/cat/z3950/t_target.tt2    | 2 +-
 Open-ILS/web/js/ui/default/staff/cat/services/z3950.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS