[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1524b7b033c3face2a9bbf429fb8e4d205a9d972

[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  1524b7b033c3face2a9bbf429fb8e4d205a9d972 (commit)
      from  eb0c22425d41910be16b405a19bccf9f07b4a54b (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 1524b7b033c3face2a9bbf429fb8e4d205a9d972
Author: Mike Rylander <mrylander at gmail.com>
Date:   Fri Jun 1 13:50:21 2018 -0400

    LP#1736269: Mark Missing Pieces is non-functional
    
    In the work to separate the item service into a reusable component, a
    reference to $scope was left hanging around.  This causes the service to die
    before it can complete its work.  The code using $scope does seem to be
    necessary, so we'll have the function accept an outer_scope parameter and
    adjust the call sites.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/missing_pieces.js b/Open-ILS/web/js/ui/default/staff/cat/item/missing_pieces.js
index a734e4a..4349bdd 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/missing_pieces.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/missing_pieces.js
@@ -46,7 +46,7 @@ function($scope, $q, $window, $location, egCore, egConfirmDialog, egAlertDialog,
     }
 
     function mark_missing_pieces(copy) {
-        itemSvc.mark_missing_pieces(copy);
+        itemSvc.mark_missing_pieces(copy,$scope);
     }
 
     $scope.print_letter = function() {
@@ -66,7 +66,7 @@ function($scope, $q, $window, $location, egCore, egConfirmDialog, egAlertDialog,
         $scope.selectMe = false;
         $scope.letter = null;
 
-        get_copy(args.barcode).then(mark_missing_pieces);
+        get_copy(args.barcode).then(function(c){ return mark_missing_pieces(c,$scope) });
     }
 
 }])
diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
index ef3944f..6a79396 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
@@ -376,7 +376,7 @@ function($scope , $q , $window , $location , $timeout , egCore , checkinSvc , eg
         angular.forEach(items, function(i){
             i.acp.call_number(i.acn);
             i.acp.call_number().record(i.record);
-            itemSvc.mark_missing_pieces(i.acp);
+            itemSvc.mark_missing_pieces(i.acp,$scope);
         });
     }
 
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index b1285af..d931d3a 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -880,7 +880,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
         }
     }
 
-    service.mark_missing_pieces = function(copy) {
+    service.mark_missing_pieces = function(copy,outer_scope) {
         var b = copy.barcode();
         var t = egCore.idl.toHash(copy.call_number()).record.title;
         egConfirmDialog.open(
@@ -920,7 +920,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
             }
 
             if (payload.letter) {
-                $scope.letter = payload.letter.template_output().data();
+                outer_scope.letter = payload.letter.template_output().data();
             }
 
             // apply patron penalty

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

Summary of changes:
 .../js/ui/default/staff/cat/item/missing_pieces.js |    4 ++--
 .../web/js/ui/default/staff/circ/checkin/app.js    |    2 +-
 .../web/js/ui/default/staff/circ/services/item.js  |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS