[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. 1e2ab548d358bdf9304e9f9faa653b18ef30c3a8

[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_3 has been updated
       via  1e2ab548d358bdf9304e9f9faa653b18ef30c3a8 (commit)
       via  d6691e6a21a769b00bd11c1f2c47a1651bfe4f4e (commit)
      from  d3f449dd222b108f62caedcd3f06b0be88102f77 (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 1e2ab548d358bdf9304e9f9faa653b18ef30c3a8
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Mar 8 12:09:07 2019 -0500

    LP1803584 Avoid JS errors when clearing copy templates
    
    Minor fix to sanity check multi-copy data in the copy template editor
    after clearing the template contents.  This cleans up some ugly console
    errors.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 5f8770330a..6813258c47 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
@@ -1202,7 +1202,8 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         var keys = Object.keys($scope.working.MultiMap);
         // for-loop for shortcut exit
         for (var i = 0; i < keys.length; i++) {
-            if ($scope.working.MultiMap[keys[i]].length > 1) {
+            if ($scope.working.MultiMap[keys[i]] &&
+                $scope.working.MultiMap[keys[i]].length > 1) {
                 return true;
             }
         }

commit d6691e6a21a769b00bd11c1f2c47a1651bfe4f4e
Author: Jason Boyer <jboyer at library.in.gov>
Date:   Thu Nov 15 13:45:44 2018 -0500

    LP1803584: Fix Clear button in template editor
    
    There are multiple controllers in staff/cat/volcopy/ and
    2 of them have a clearWorking() function. The template
    editor controller is referencing $scope.MultiMap[] which
    will never exist in the template editor, while the actual
    item editor controller clearWorking() does not reference
    $scope.MultiMap[], meaning that clearing multiple items
    at once would not work as expected. This branch clears
    up this confusion.
    
    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
    Signed-off-by: Beth Willis <willis at noblenet.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 79dbf81e61..5f8770330a 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
@@ -2567,8 +2567,6 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
 
                 $scope.clearWorking = function () {
                     angular.forEach($scope.working, function (v,k,o) {
-                        if (k != 'MultiMap') $scope.working.MultiMap[k] = [];
-                        $scope.working.MultiMap[k] = [];
                         if (!angular.isObject(v)) {
                             if (typeof v != 'undefined')
                                 $scope.working[k] = undefined;

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS