From 94d2a1033ff5b5589c8cca08ab6c0d143f810656 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Wed, 17 Jan 2018 12:25:49 -0500 Subject: [PATCH] LP#1743819: Use combcirc rather than circ to get circ data This addresses a merge regression. Signed-off-by: Mike Rylander Signed-off-by: Galen Charlton --- Open-ILS/web/js/ui/default/staff/circ/services/item.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 79a8b0fb77..fa9f4408f9 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 @@ -30,7 +30,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog service.circFlesh = { flesh : 2, flesh_fields : { - circ : [ + combcirc : [ 'usr', 'workstation', 'checkin_workstation', @@ -41,7 +41,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog ], au : ['card'] }, - order_by : {circ : 'xact_start desc'}, + order_by : {combcirc : 'xact_start desc'}, limit : 1 } -- 2.43.2