[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 2a736f126a4a086ab5f294db928cb49a984d4c4a

[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, rel_3_1 has been updated
       via  2a736f126a4a086ab5f294db928cb49a984d4c4a (commit)
      from  b53d2972a5abbcb0b6814fd00a227189e7c64269 (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 2a736f126a4a086ab5f294db928cb49a984d4c4a
Author: Jason Boyer <jboyer at equinoxinitiative.org>
Date:   Tue Oct 22 09:18:29 2019 -0400

    LP1825403: Do not Include Tag Owner in Tag
    
    Copy tags were accidentally having their owning
    location shortname included in the tag values,
    this patch allows the owner to be displayed but
    not included in the value used.
    
    Signed-off-by: Jason Boyer <jboyer at equinoxinitiative.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
index 64a689186c..dd2b064342 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
@@ -21,7 +21,7 @@
           <div class="form-group">
             <label for="tagLabel">[% l('Tag') %]</label>
             <input name="tabLabel" type="text" ng-model="selectedLabel" placeholder="[% l('Enter tag label...') %]"
-                uib-typeahead="tag for tag in getTags($viewValue)" typeahead-editable="false"
+                uib-typeahead="tag.value as tag.display for tag in getTags($viewValue)" typeahead-editable="false"
                 class="form-control" autocomplete="off"></input>
           </div>
           <button type="button" class="btn btn-sm btn-default" ng-click="addTag()">[% l('Add Tag') %]</button>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
index 773f5db302..4257bf89fa 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
@@ -21,7 +21,7 @@
           <div class="form-group">
             <label for="tagLabel">[% l('Tag') %]</label>
             <input name="tabLabel" type="text" ng-model="selectedLabel" placeholder="[% l('Enter tag label...') %]"
-                uib-typeahead="tag for tag in getTags($viewValue)"
+                uib-typeahead="tag.value as tag.display for tag in getTags($viewValue)"
                 class="form-control" autocomplete="off"></input>
           </div>
           <button type="button" class="btn btn-sm btn-default" ng-click="addTag()">[% l('Add Tag') %]</button>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
index 0335f3f9b2..202a4bfe4c 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
@@ -799,7 +799,7 @@ function($scope,  $q , $routeParams , $timeout , $window , $uibModal , bucketSvc
                         { order_by : { 'acpt' : ['label'] } }, { atomic: true }
                     ).then(function(list) {
                         return list.map(function(item) {
-                            return item.label();
+                            return { value: item.label(), display: item.label() + " (" + egCore.org.get(item.owner()).shortname() + ")" };
                         });
                     });
                 }
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 192798df7c..cf2cb8c90c 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
@@ -2183,7 +2183,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                         { order_by : { 'acpt' : ['label'] } }, { atomic: true }
                     ).then(function(list) {
                         return list.map(function(item) {
-                            return item.label() + " (" + egCore.org.get(item.owner()).shortname() + ")";
+                            return { value: item.label(), display: item.label() + " (" + egCore.org.get(item.owner()).shortname() + ")" };
                         });
                     });
                 }

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

Summary of changes:
 Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 | 2 +-
 Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2      | 2 +-
 Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js       | 2 +-
 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS