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: Terran McCanna <tmccanna@georgialibraries.org>
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 2b99b46..59d92a8 100644 (file)
--- 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
     }