[open-ils-commits] [GIT] Evergreen ILS branch master updated. 94d2a1033ff5b5589c8cca08ab6c0d143f810656

[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, master has been updated
       via  94d2a1033ff5b5589c8cca08ab6c0d143f810656 (commit)
      from  c1edfced5c4cc8ec271f79f0d907de7b1a3dc832 (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 94d2a1033ff5b5589c8cca08ab6c0d143f810656
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: 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 79a8b0f..fa9f440 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