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

[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  23a21e4e529ac2215962f419ed9bb486a5096e84 (commit)
      from  999fb0b7da7f083ce7939433a36a955cdf056fb7 (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 23a21e4e529ac2215962f419ed9bb486a5096e84
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Jun 19 14:23:42 2018 -0400

    LP#1751368 Items-out checkin of deleted copies
    
    Allow deleted copies to be checked in from the patron items out list.
    Checkin is based on copy ID instead of barcode.  Note that both values
    are sent to the server, to reduce the number of changes in the UI code,
    but the API inspects the ID first.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index 4543797..e1bcf2a 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -504,16 +504,21 @@ function($scope , $q , $routeParams , $timeout , egCore , egUser , patronSvc ,
 
     $scope.checkin = function(items) {
         if (!items.length) return;
-        var barcodes = items.map(function(circ) 
-            { return circ.target_copy().barcode() });
+        var copies = items.map(function(circ) { return circ.target_copy() });
+        var barcodes = copies.map(function(copy) { return copy.barcode() });
 
         return egConfirmDialog.open(
             egCore.strings.CHECK_IN_CONFIRM, barcodes.join(' '), {
 
         }).result.then(function() {
+            var copy;
             function do_one() {
-                if (bc = barcodes.pop()) {
-                    egCirc.checkin({copy_barcode : bc})
+                if (copy = copies.pop()) {
+                    // Checkin expects a barcode, but will pass other
+                    // parameters too.  Passing the copy ID allows
+                    // for the checkin of deleted copies on the server.
+                    egCirc.checkin(
+                        {copy_barcode: copy.barcode(), copy_id: copy.id()})
                     .finally(do_one);
                 } else {
                     reset_page();

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

Summary of changes:
 .../js/ui/default/staff/circ/patron/items_out.js   |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS