[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. ba3c0e4c8eb2ef4003262056b5b706218c7de261

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_0 has been updated
       via  ba3c0e4c8eb2ef4003262056b5b706218c7de261 (commit)
      from  4ffc5d353269f5930951fec19997b25ebcad82a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ba3c0e4c8eb2ef4003262056b5b706218c7de261
Author: Mike Rylander <mrylander at gmail.com>
Date:   Wed Jan 17 12:25:49 2018 -0500

    LP#1743819: Use combcirc rather than circ to get circ data
    
    This addresses a merge regression.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at 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
--- 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
     }
 

-----------------------------------------------------------------------

Summary of changes:
 .../web/js/ui/default/staff/circ/services/item.js  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS