LP1722383 - Alphabetical sorting of Workstations

Updated the "orderBy" filter in
Evergreen/Open-ILS/src/templates/staff/t_login.tt2 and
Evergreen/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
to sort by "ws" directly rather than trying to access the "name"
attribute.

https://mlnc3.noblenet.org/eg/staff/login?#

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
index 0400878..ef551d5 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
@@ -47,7 +47,7 @@
   <div class="row">
     <div class="col-md-6">
       <select class="form-control" ng-model="selectedWS">
-        <option ng-repeat="ws in workstations | orderBy: 'name'" value="{{ws}}"
+        <option ng-repeat="ws in workstations | orderBy: 'ws'" value="{{ws}}"
           ng-selected="ws == selectedWS">
           {{get_ws_label(ws)}}
         </option>

diff --git a/Open-ILS/src/templates/staff/t_login.tt2 b/Open-ILS/src/templates/staff/t_login.tt2
index 1d777e6..fcd22f8 100644 (file)
--- a/Open-ILS/src/templates/staff/t_login.tt2
+++ b/Open-ILS/src/templates/staff/t_login.tt2
@@ -34,7 +34,7 @@
                 for="login-workstation">[% l('Workstation') %]</label>
               <div class="col-md-8">
                 <select class="form-control" ng-model="args.workstation"
-                  ng-options="ws for ws in workstations | orderBy: 'name'">
+                  ng-options="ws for ws in workstations | orderBy: 'ws'">
                   <option>[% l('Select Workstation') %]</option>
                 </select>
               </div>