webstaff: SCT editor now displays location names qualified with OU

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/admin/serials/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/admin/serials/t_attr_edit.tt2
index d1be2d3..a4bfecf 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/serials/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/admin/serials/t_attr_edit.tt2
@@ -133,7 +133,7 @@
                 <div class="col-md-6" ng-class="{'bg-success': working.location !== undefined}">
                     <select class="form-control"
                         ng-disabled="!defaults.attributes.location" ng-model="working.location"
-                        ng-options="l.id() as l.name() for l in location_list"
+                        ng-options="l.id() as i18n.ou_qualified_location_name(l) for l in location_list"
                     ></select>
                 </div>
                 <div class="col-md-6" ng-class="{'bg-success': working.opac_visible !== undefined}">

diff --git a/Open-ILS/web/js/ui/default/staff/admin/serials/app.js b/Open-ILS/web/js/ui/default/staff/admin/serials/app.js
index 71ac4f2..81f68e4 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/admin/serials/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/serials/app.js
@@ -93,7 +93,13 @@ function(egCore , $q) {
                 owning_lib : orgs,
                 deleted    : 'f'
             },
-            {order_by : { acpl : 'name' }}, {atomic : true}
+            {
+                flesh : 1,
+                flesh_fields : {
+                    'acpl' : ['owning_lib']
+                },
+                order_by : { acpl : 'name' }
+            }, {atomic : true}
         );
     };
 
@@ -502,7 +508,8 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                 };
                 $scope.location_orgs = [];
                 $scope.location_cache = {};
-            
+
+                $scope.i18n = egCore.i18n;
                 $scope.location_list = [];
                 itemSvc.get_locations(
                     egCore.org.fullPath( egCore.auth.user().ws_ou(), true )