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

[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  d02163c4f7a4c1b8223943c86da37bd2ca3f3a44 (commit)
      from  c43bc5b98fc51849958e7213ae706c795e803d3a (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 d02163c4f7a4c1b8223943c86da37bd2ca3f3a44
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Sep 11 11:13:57 2017 -0400

    LP#1713151: display owning OU in volcopy editor location selector
    
    This patch causes the short name of the OU that owns a location
    to be displayed after the location name in shelving location selectors
    in the item attribute and copy template editors.
    
    To test
    -------
    [1] Edit an item and verify that the shelving location selector
        displays the org unit shortname in parentheses after the location
        name.
    [2] Verify that the location selector in the copy template portion
        also displays the OU short names.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Andrea Neiman <abneiman at equinoxinitiative.org>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index 6e40e32..1d01491 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -183,7 +183,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/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 285f5e8..4a0c956 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -139,7 +139,14 @@ function(egCore , $q) {
     service.get_locations = function(orgs) {
         return egCore.pcrud.search('acpl',
             {owning_lib : orgs, deleted : 'f'},
-            {order_by : { acpl : 'name' }}, {atomic : true}
+            {
+                flesh : 1,
+                flesh_fields : {
+                    acpl : ['owning_lib']
+                },
+                order_by : { acpl : 'name' }
+            },
+            {atomic : true}
         );
     };
 
@@ -809,6 +816,7 @@ function(egCore , $q) {
 function($scope , $q , $window , $routeParams , $location , $timeout , egCore , egNet , egGridDataProvider , itemSvc , $uibModal) {
 
     $scope.forms = {}; // Accessed by t_attr_edit.tt2
+    $scope.i18n = egCore.i18n;
 
     $scope.defaults = { // If defaults are not set at all, allow everything
         barcode_checkdigit : false,
@@ -1845,6 +1853,8 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         controller : ['$scope','$window','itemSvc','egCore','ngToast',
             function ( $scope , $window , itemSvc , egCore , ngToast) {
 
+                $scope.i18n = egCore.i18n;
+
                 $scope.defaults = { // If defaults are not set at all, allow everything
                     barcode_checkdigit : false,
                     auto_gen_barcode : false,

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

Summary of changes:
 .../templates/staff/cat/volcopy/t_attr_edit.tt2    |    2 +-
 .../web/js/ui/default/staff/cat/volcopy/app.js     |   12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS