[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 3f88c56f7eafdc53ff7be69ad91910a281357fa4

[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  3f88c56f7eafdc53ff7be69ad91910a281357fa4 (commit)
       via  39136e3cf7daad2e5805b5609ebddd8806c9362f (commit)
      from  d9d9d766b1a772f749b1bcf4e9ebbadd929bc4d9 (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 3f88c56f7eafdc53ff7be69ad91910a281357fa4
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Wed Oct 10 16:07:24 2018 -0400

    LP#1796978 Realign working copy refresh with proper condition
    
    The "working copy" grid needs to update whenever the copy data above
    updates.  I *believe* this aligns the refresh with its intended
    condition.
    
    This appears to have come about via bug #1732761, so retesting of
    that fix may be in order.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Cesar Velez <cesar.velez 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 d32f943..7ef69d4 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
@@ -1808,9 +1808,9 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                             });
                         });
                     }
+                } else {
+                    $scope.workingGridDataProvider.refresh();
                 }
-            } else {
-                $scope.workingGridDataProvider.refresh();
             }
         });
 

commit 39136e3cf7daad2e5805b5609ebddd8806c9362f
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu Oct 11 09:21:05 2018 -0400

    LP#1796971 Wait for call number and copy before loading locations
    
    In cases where add a copy to a call number, we fetch the original
    call number via async, then attach the new copy to it.  Before this
    commit, however, we were not waiting for the call number fetch
    promise to resolve, so the copy wasn't there to use for limiting the
    location load.
    
    Since the async request is internal to a loop, one way out is to
    capture that promise, then make sure it resolves before loading the
    locations.
    
    (We previously returned the copies from the internal function, but that
    value wasn't being used anyway, so we don't worry about unwrapping the
    $q.all() when it resolves.)
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: John Amundson <jamundson at cwmars.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    
    Conflicts:
    	Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js

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 f628abe..d32f943 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
@@ -1490,12 +1490,13 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                      * All can be left out and a completely empty vol/copy combo will be vivicated.
                      */
 
+                    var promises = [];
                     angular.forEach(
                         data.raw,
                         function (proto) {
                             if (proto.fast_add) $scope.is_fast_add = true;
                             if (proto.callnumber) {
-                                return egCore.pcrud.retrieve('acn', proto.callnumber)
+                                promises.push(egCore.pcrud.retrieve('acn', proto.callnumber)
                                 .then(function(cn) {
                                     var cp = new itemSvc.generateNewCopy(
                                         cn,
@@ -1510,7 +1511,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                                     }
 
                                     itemSvc.addCopy(cp)
-                                });
+                                }));
                             } else {
                                 var cn = new egCore.idl.acn();
                                 cn.id( --itemSvc.new_cn_id );
@@ -1569,7 +1570,15 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                         }
                     );
 
-                    return itemSvc.copies;
+                    angular.forEach(itemSvc.copies, function(c){
+                        var cn = c.call_number();
+                        var copy_id = c.id();
+                        if (copy_id > 0){
+                            cn.not_ephemeral = true;
+                        }
+                    });
+
+                    return $q.all(promises);
                 }
 
                 if (data.copies && data.copies.length)

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

Summary of changes:
 .../web/js/ui/default/staff/cat/volcopy/app.js     |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS