From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 17 Jan 2018 17:25:49 +0000 (-0500)
Subject: LP#1743819: Use combcirc rather than circ to get circ data
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=94d2a1033ff5b5589c8cca08ab6c0d143f810656;p=evergreen%2Fjoelewis.git

LP#1743819: Use combcirc rather than circ to get circ data

This addresses a merge regression.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

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
     }