From 1417629657c4ab98a57aec29065d9d7f5b3ef289 Mon Sep 17 00:00:00 2001 From: Cesar Velez Date: Thu, 4 Jan 2018 17:36:02 -0500 Subject: [PATCH] LP#1739648 - fix item duplication in itemsout and holds grids Since these grids have caching, if the offset was greater the cached data length, the grid would try to fetch data again, even if it's already there, pushing duplicate items into the cache. This should prevent that. Signed-off by: Cesar Velez Signed-off-by: Jason Etheridge --- Open-ILS/web/js/ui/default/staff/circ/patron/holds.js | 2 +- Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js b/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js index 41e0223308..6d017d4782 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js @@ -90,7 +90,7 @@ function($scope, $q, $routeParams, egCore, egUser, patronSvc, egCore.auth.token(), $scope.patron_id ).then(function(hold_ids) { - if (!hold_ids.length) { deferred.resolve(); return; } + if (!hold_ids.length || hold_ids.length < offset + 1) { deferred.resolve(); return; } patronSvc.hold_ids = hold_ids; fetchHolds(offset, count) 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 6679af6b1d..daf0041b5b 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 @@ -96,7 +96,7 @@ function($scope, $q, $routeParams, $timeout, egCore , egUser, patronSvc , $ $scope.gridDataProvider = provider; function fetch_circs(id_list, offset, count) { - if (!id_list.length) return $q.when(); + if (!id_list.length || id_list.length < offset + 1) return $q.when(); var deferred = $q.defer(); var rendered = 0; -- 2.11.0