[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 6066f441330108b99f160a80bef7fc63958356cc

[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_2_12 has been updated
       via  6066f441330108b99f160a80bef7fc63958356cc (commit)
      from  f2b584ece6fd48a9b52106f6bc28f48ccf78af3a (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 6066f441330108b99f160a80bef7fc63958356cc
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Fri Aug 25 09:03:08 2017 -0700

    LP#1699566: fix barcode completion merge error
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 97e387a..293e74c 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -48,8 +48,8 @@ angular.module('egItemStatus',
 })
 
 .factory('itemSvc', 
-       ['egCore',
-function(egCore) {
+       ['egCore','egCirc',
+function(egCore , egCirc) {
 
     var service = {
         copies : [], // copy barcode search results
@@ -70,15 +70,6 @@ function(egCore) {
         } 
     }
 
-    // resolved with the last received copy
-    service.fetch = function(barcode, id, noListDupes) {
-        var promise;
-
-        if (barcode) {
-            promise = egCore.pcrud.search('acp', 
-                {barcode : barcode, deleted : 'f'}, service.flesh);
-        } else {
-            promise = egCore.pcrud.retrieve('acp', id, service.flesh);
     //Retrieve separate copy, aacs, and accs information
     service.getCopy = function(barcode, id) {
         if (barcode) {
@@ -87,12 +78,16 @@ function(egCore) {
             .then(function(actual_barcode) {
                 return egCore.pcrud.search(
                     'acp', {barcode : actual_barcode, deleted : 'f'},
-                    service.flesh).then(function(copy) {return copy});
+                    service.flesh);
             });
         }
+        return egCore.pcrud.retrieve( 'acp', id, service.flesh);
+    }
 
+    // resolved with the last received copy
+    service.fetch = function(barcode, id, noListDupes) {
         var lastRes;
-        return promise.then(
+        return service.getCopy(barcode, id).then(
             function() {return lastRes},
             null, // error
 

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/cat/item/app.js |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Evergreen ILS