From 66860690a02f3a0cd5049cf398675419fb71ed16 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 3 Nov 2017 16:49:50 -0400 Subject: [PATCH] fix rebase error Signed-off-by: Galen Charlton --- Open-ILS/web/js/ui/default/staff/circ/services/item.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5bc0bde2ab..61fc783c3e 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 @@ -152,7 +152,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog flatCopy._duration = copyData.circ.duration(); } flatCopy.index = service.index++; - flatCopy.copy_alert_count = copy.copy_alerts().filter(function(aca) { + flatCopy.copy_alert_count = copyData.copy.copy_alerts().filter(function(aca) { return !aca.ack_time(); }).length; -- 2.11.0